Merge pull request #97 from moosetechnology/parametric

Correct exclude file option to use absolute path instead of filename
moosetechnology · Nov 24, 2023 · 5c1b579 · 5c1b579
2 parents 279eb94 + 3c44e4a
commit 5c1b579
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/fr/inria/verveine/extractor/java/VerveineJOptions.java b/src/fr/inria/verveine/extractor/java/VerveineJOptions.java
@@ -535,7 +535,9 @@ protected void collectJavaFiles(Collection<String> paths, Collection<String> fil
 
 	protected void collectJavaFiles(File f, Collection<String> files) {
 		for (Pattern filter : excludeMatchers) {
-			if (filter.matcher(f.getName()).matches()) {
+			String absolutePath = f.getAbsolutePath();
+			if (filter.matcher(absolutePath).matches()) {
+				System.out.println("Excluded file: " + absolutePath);
 				return;
 			}
 		}

diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java
@@ -330,9 +330,15 @@ public void testAnchorsAssoc()
     @Test
     public void testExcludepath()
     {
+    	String excludeDir ;
+    	if(isWindows()) {
+    		excludeDir = "*server\\\\*";
+    	}else {
+    		excludeDir = "*server/*";
+    	}
         String[] args = new String[] {
                 "-excludepath", "*Address*",
-                "-excludepath", "*erver*",
+                "-excludepath", excludeDir,
                 "test_src/LANModel/",
         };