fixes matyb#33

matyb · matyb · commit d443efae6093 · 2019-02-14T23:50:51.000-05:00
diff --git a/koans/app/config/config.properties b/koans/app/config/config.properties
@@ -1,5 +1,5 @@
 compile_timeout_in_ms=5000
-ignore_from_monitoring=.*\\.idea
+ignore_from_monitoring=(.*\\.idea|^\\.#.*\\..*|^#.*\\..*)
 debug=false
 exit_character=Q
 enable_encouragement=false
diff --git a/lib/src/main/java/com/sandwich/util/io/StreamUtils.java b/lib/src/main/java/com/sandwich/util/io/StreamUtils.java
@@ -7,10 +7,13 @@
 public class StreamUtils {
 
 	public static String convertStreamToString(InputStream stream) {
+		Scanner scanner = new Scanner(stream);
 		try {
-			return new Scanner(stream).useDelimiter("\\A").next();
+			return scanner.useDelimiter("\\A").next();
 		} catch (NoSuchElementException e) {
 			return "";
+		} finally {
+			scanner.close();
 		}
 	}
 
diff --git a/lib/src/test/java/com/sandwich/util/KoanComparatorTest.java b/lib/src/test/java/com/sandwich/util/KoanComparatorTest.java
@@ -44,20 +44,20 @@ public void testComparatorRanksByOrder() throws Exception {
 		assertSame(m2,methods.get(1));
 	}
 	
-	@Test
-	public void testVariableNamesArentConfusedAsKoanMethodsWhenSorting() throws Exception {
-	    Class<? extends Object> clazz = new Object(){
-	        String foo;
-	        @Koan public void bar(){}
-	        @Koan public void foo(){}
-	    }.getClass();
-	    KoanMethod m1 = KoanMethod.getInstance("", clazz.getDeclaredMethod("bar"));
-	    KoanMethod m2 = KoanMethod.getInstance("", clazz.getDeclaredMethod("foo"));
-	    List<KoanMethod> methods = Arrays.asList(m2,m1);
-	    Collections.sort(methods, new KoanComparator());
-	    assertSame(m1,methods.get(0));
-	    assertSame(m2,methods.get(1));
-	}
-
+    @Test
+    public void testVariableNamesArentConfusedAsKoanMethodsWhenSorting() throws Exception {
+        Class<? extends Object> clazz = new Object(){
+            @SuppressWarnings("unused")
+            String foo;
+            @Koan public void bar(){}
+            @Koan public void foo(){}
+        }.getClass();
+        KoanMethod m1 = KoanMethod.getInstance("", clazz.getDeclaredMethod("bar"));
+        KoanMethod m2 = KoanMethod.getInstance("", clazz.getDeclaredMethod("foo"));
+        List<KoanMethod> methods = Arrays.asList(m2,m1);
+        Collections.sort(methods, new KoanComparator());
+        assertSame(m1,methods.get(0));
+        assertSame(m2,methods.get(1));
+    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,13 @@`
`7`	`7`	`public class StreamUtils {`
`8`	`8`
`9`	`9`	`public static String convertStreamToString(InputStream stream) {`
	`10`	`+ Scanner scanner = new Scanner(stream);`
`10`	`11`	`try {`
`11`		`- return new Scanner(stream).useDelimiter("\\A").next();`
	`12`	`+ return scanner.useDelimiter("\\A").next();`
`12`	`13`	`} catch (NoSuchElementException e) {`
`13`	`14`	`return "";`
	`15`	`+ } finally {`
	`16`	`+ scanner.close();`
`14`	`17`	`}`
`15`	`18`	`}`
`16`	`19`