Fix Java Test Counting Bug - #45

data-collection/src/main/java/refactoringml/ProcessMetricsCollector.java

@@ -128,10 +128,8 @@ private void updateProcessMetrics(RevCommit commit, RevCommit commitParent) thro
 				}
 
 				// do not collect these numbers if not a java file (save some memory)
-				boolean isAJavaFile = fileName.toLowerCase().endsWith("java");
-				if (!isAJavaFile) {
+				if (!refactoringml.util.FileUtils.IsJavaFile(fileName))
 					continue;
-				}
 
 				// if the class was either removed or deleted, we remove it from our pmDatabase, as to not mess
 				// with the refactoring counter...

data-collection/src/main/java/refactoringml/util/FileUtils.java

@@ -27,19 +27,21 @@ public static String[] getAllJavaFiles(String path) {
 	}
 
 	public static String[] getAllJavaFiles(String path, String regex) {
-
 		try {
 			return Files.walk(Paths.get(path))
 					.filter(Files::isRegularFile)
 					.filter(x -> !x.toAbsolutePath().toString().contains(".git"))
-					.filter(x -> x.toAbsolutePath().toString().toLowerCase().endsWith("java"))
+					.filter(x -> IsJavaFile(x.toAbsolutePath().toString()))
 					.filter(x -> (regex!=null?x.toAbsolutePath().toString().contains(regex):true))
 					.map(x -> x.toAbsolutePath().toString())
 					.toArray(String[]::new);
 		} catch(Exception e) {
 			throw new RuntimeException(e);
 		}
-
 	}
 
+	//Returns true if a file is a java file.
+	public static boolean IsJavaFile(String fileName){
+		return fileName.toLowerCase().endsWith("java");
+	}
 }

data-collection/src/main/java/refactoringml/util/RefactoringUtils.java

@@ -11,6 +11,8 @@
 import java.util.List;
 import java.util.Set;
 
+import static refactoringml.util.FilePathUtils.enforceUnixPaths;
+
 public class RefactoringUtils {
 
 	public static final int TYPE_CLASS_LEVEL = 1;
@@ -235,9 +237,11 @@ public static int refactoringTypeInNumber(Refactoring refactoring) {
 	}
 
 	public static boolean isTestFile(String fileName) {
-		String normalizedFileName = fileName.toLowerCase();
-		return normalizedFileName.contains("test.java") || normalizedFileName.contains("tests.java") ||
+		if(!FileUtils.IsJavaFile(fileName))
+			return false;
+
+		String normalizedFileName = enforceUnixPaths(fileName.toLowerCase());
+		return normalizedFileName.contains("test") ||
 				normalizedFileName.contains("/test/");
 	}
-
-}
+}