Polish

spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java

@@ -27,6 +27,8 @@ import org.junit.Test;
 import org.springframework.boot.cli.command.grab.GrabCommand;
 import org.springframework.util.FileSystemUtils;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -68,8 +70,9 @@ public class GrabCommandIntegrationTests {
 			this.cli.grab("duplicateGrabMetadata.groovy");
 			fail();
 		}
-		catch (Exception e) {
-			assertTrue(e.getMessage().contains("Duplicate @GrabMetadata annotation"));
+		catch (Exception ex) {
+			assertThat(ex.getMessage(),
+					containsString("Duplicate @GrabMetadata annotation"));
 		}
 	}
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java

@@ -79,9 +79,4 @@ public class ReproIntegrationTests {
 		assertThat(this.cli.getOutput(), containsString("Hello World"));
 	}
 
-	@Test
-	public void caching() throws Exception {
-		this.cli.run("caching.groovy");
-		assertThat(this.cli.getOutput(), containsString("Hello World"));
-	}
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java

@@ -24,7 +24,9 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -156,4 +158,10 @@ public class SampleIntegrationTests {
 		assertEquals("Hello Normal Device!", this.cli.getHttpOutput());
 	}
 
+	@Test
+	public void caching() throws Exception {
+		this.cli.run("caching.groovy");
+		assertThat(this.cli.getOutput(), containsString("Hello World"));
+	}
+
 }

spring-boot-cli/src/test/resources/repro-samples/caching.groovy

@@ -1,47 +0,0 @@
-package org.test
-
-import java.util.concurrent.atomic.AtomicLong
-
-@Configuration
-@EnableCaching
-class Sample {
-
-	@Bean CacheManager cacheManager() {
-		new ConcurrentMapCacheManager()
-	}
-
-	@Component
-	static class MyClient implements CommandLineRunner {
-
-		private final MyService myService
-
-		@Autowired
-		MyClient(MyService myService) {
-			this.myService = myService
-		} 
-
-		void run(String... args) { 
-			long counter = myService.get('someKey')
-			long counter2 = myService.get('someKey')
-			if (counter == counter2) {
-				println 'Hello World'
-			} else {
-				println 'Something went wrong with the cache setup'
-			}
-
-		}
-	}
-
-	@Component
-	static class MyService {
-
-		private final AtomicLong counter = new AtomicLong()
-
-		@Cacheable('foo')
-		Long get(String id) {
-			return counter.getAndIncrement()
-		}
-
-	}
-
-}