On TestFile constructor, file without extension and path without sepa…

…rator aren't treated as special cases, they throw an IllegalArgumentException instead

src/main/java/edu/rit/se/testsmells/testsmell/TestFile.java

@@ -11,11 +11,26 @@ public class TestFile extends SmellsContainer {
 
     public TestFile(String app, String testFilePath, String productionFilePath) {
         super();
+        checkValidity(testFilePath, productionFilePath, app);
         this.app = app;
         this.testFilePath = testFilePath;
         this.productionFilePath = productionFilePath;
     }
 
+    protected void checkValidity(String testPath, String prodPath, String app) {
+        if (!haveExtension(testPath, prodPath) || !haveFileSeparator(testPath, prodPath) || app.isEmpty()) {
+            throw new IllegalArgumentException("Both testFilePath and productionFilePath should include extensions and file separator. App cannot be empty!");
+        }
+    }
+
+    private boolean haveFileSeparator(String testPath, String prodPath) {
+        return testPath.lastIndexOf(File.separator) != -1 && prodPath.lastIndexOf(File.separator) != -1;
+    }
+
+    private boolean haveExtension(String testPath, String prodPath) {
+        return testPath.lastIndexOf('.') != -1 && prodPath.lastIndexOf('.') != -1;
+    }
+
     public Map<String, String> getTestDescriptionEntries() {
         Map<String, String> descriptions = new HashMap<>();
 
@@ -76,11 +91,7 @@ public String getProductionFileName() {
      * @return the relative test file path
      */
     public String getRelativeTestFilePath() {
-        if (!StringUtils.isEmpty(testFilePath)) {
-            int projectNameIndex = testFilePath.lastIndexOf(app);
-            if (projectNameIndex == -1) return "";
-            return testFilePath.substring(projectNameIndex + app.length() + File.separator.length());
-        } else return "";
+        return extractRelativePathFrom(testFilePath);
     }
 
     /**
@@ -90,10 +101,14 @@ public String getRelativeTestFilePath() {
      * @return the relative production file path
      */
     public String getRelativeProductionFilePath() {
-        if (!StringUtils.isEmpty(productionFilePath)) {
-            int projectNameIndex = productionFilePath.lastIndexOf(app);
+        return extractRelativePathFrom(productionFilePath);
+    }
+
+    private String extractRelativePathFrom(String path) {
+        if (!StringUtils.isEmpty(path)) {
+            int projectNameIndex = path.lastIndexOf(app);
             if (projectNameIndex == -1) return "";
-            return productionFilePath.substring(projectNameIndex + app.length() + File.separator.length());
+            return path.substring(projectNameIndex + app.length() + File.separator.length());
         } else return "";
     }
 }

src/test/java/edu/rit/se/testsmells/testsmell/TestFileTest.java

@@ -8,71 +8,77 @@
 import java.io.File;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class TestFileTest {
-
+@EnabledOnOs({OS.LINUX, OS.MAC})
+class UnixTestFileTest {
     private String fileTest = "commons-lang," +
             "/Users/grano/projects/commons-lang/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java," +
             "/Users/grano/projects/commons-lang/src/main/java/org/apache/commons/lang3/RandomStringUtils.java";
-    private String fileTestWindows = "myCoolApp," +
-            "F:\\Apps\\myCoolApp\\code\\test\\GraphTest.java," +
-            "F:\\Apps\\myCoolApp\\code\\src\\Graph.java";
     private TestFile testFileUnix;
-    private TestFile testFileWindows;
 
     @BeforeEach
     void setUp() {
         String[] splits = fileTest.split(",");
         testFileUnix = new TestFile(splits[0], splits[1], splits[2]);
-        String[] splitW = fileTestWindows.split(",");
-        testFileWindows = new TestFile(splitW[0], splitW[1], splitW[2]);
     }
 
     @Test
-    @EnabledOnOs({OS.WINDOWS})
-    public void testGetFileNameWindows() {
-        String oracle = "GraphTest.java";
-        String output = testFileWindows.getTestFileName();
+    public void testGetProductionFileNameUnix() {
+        String oracle = "RandomStringUtils.java";
+        String output = testFileUnix.getProductionFileName();
         assertEquals(oracle, output);
     }
 
     @Test
-    @EnabledOnOs({OS.LINUX, OS.MAC})
     public void testGetFileNameUnix() {
         String oracle = "RandomStringUtilsTest.java";
         String output = testFileUnix.getTestFileName();
         assertEquals(oracle, output);
     }
 
     @Test
-    @EnabledOnOs({OS.WINDOWS})
-    public void testProductionFileNameWindows() {
-        String oracle = "Graph.java";
-        String output = testFileWindows.getProductionFileName();
+    public void testGetRelativeProductionFilePathUnix() {
+        String oracle = "src/main/java/org/apache/commons/lang3/RandomStringUtils.java";
+        String output = testFileUnix.getRelativeProductionFilePath();
         assertEquals(oracle, output);
     }
 
     @Test
-    @EnabledOnOs({OS.LINUX, OS.MAC})
-    public void testGetProductionFileNameUnix() {
-        String oracle = "RandomStringUtils.java";
-        String output = testFileUnix.getProductionFileName();
+    public void testGetRelativeTestFilePathUnix() {
+        String oracle = "src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java";
+        String output = testFileUnix.getRelativeTestFilePath();
         assertEquals(oracle, output);
     }
+}
+
+@EnabledOnOs({OS.WINDOWS})
+class WindowsTestFileTest {
+
+    private String fileTestWindows = "myCoolApp," +
+            "F:\\Apps\\myCoolApp\\code\\test\\GraphTest.java," +
+            "F:\\Apps\\myCoolApp\\code\\src\\Graph.java";
+    private TestFile testFileWindows;
+
+    @BeforeEach
+    void setUp() {
+        String[] split = fileTestWindows.split(",");
+        testFileWindows = new TestFile(split[0], split[1], split[2]);
+    }
 
     @Test
-    @EnabledOnOs({OS.LINUX, OS.MAC})
-    public void testGetRelativeProductionFilePathUnix() {
-        String oracle = "src/main/java/org/apache/commons/lang3/RandomStringUtils.java";
-        String output = testFileUnix.getRelativeProductionFilePath();
+    @EnabledOnOs({OS.WINDOWS})
+    public void testProductionFileNameWindows() {
+        String oracle = "Graph.java";
+        String output = testFileWindows.getProductionFileName();
         assertEquals(oracle, output);
     }
 
     @Test
-    @EnabledOnOs({OS.LINUX, OS.MAC})
-    public void testGetRelativeTestFilePathUnix() {
-        String oracle = "src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java";
-        String output = testFileUnix.getRelativeTestFilePath();
+    @EnabledOnOs({OS.WINDOWS})
+    public void testGetFileNameWindows() {
+        String oracle = "GraphTest.java";
+        String output = testFileWindows.getTestFileName();
         assertEquals(oracle, output);
     }
 
@@ -93,89 +99,30 @@ public void testGetRelativeTestFilePathWindows() {
     }
 }
 
-class FilePathWithoutSeparatorTest {
+class TestFileSpecialCasesTest {
     String path;
-    TestFile sut;
+    String app;
 
     @BeforeEach
     public void setUp() {
-        path = "file.extension";
-        sut = new TestFile("", path, path);
-    }
-
-    @Test
-    public void testTestFilePath() {
-        assertEquals(sut.getTestFilePath(), path);
+        app = "project";
     }
 
     @Test
-    public void testTestFileName() {
-        assertEquals(sut.getTestFileName(), path);
-    }
-
-    @Test
-    public void testProductionFilePath() {
-        assertEquals(sut.getProductionFilePath(), path);
-    }
-
-    @Test
-    public void testProductionFileName() {
-        assertEquals(sut.getProductionFileName(), path);
-    }
-}
-
-class FileWithoutExtension {
-    String filename;
-    String relativePath;
-    String path;
-    TestFile sut;
-
-    @BeforeEach
-    public void setUp() {
-        String app = "folder";
-        filename = "fileWithoutExtension";
-        relativePath = "to" + File.separator + filename;
-        path = app + File.separator + relativePath;
-        sut = new TestFile(app, path, path);
-    }
-
-    @Test
-    public void testTestFilePath() {
-        assertEquals(sut.getTestFilePath(), path);
-    }
-
-    @Test
-    public void testRelativeTestFilePath() {
-        assertEquals(sut.getRelativeTestFilePath(), relativePath);
-    }
-
-    @Test
-    public void testTestFileName() {
-        assertEquals(sut.getTestFileName(), filename);
-    }
-
-    @Test
-    public void testTestFileNameWithoutExtension() {
-        assertEquals(sut.getTestFileNameWithoutExtension(), filename);
-    }
-
-    @Test
-    public void testProductionFilePath() {
-        assertEquals(sut.getProductionFilePath(), path);
-    }
-
-    @Test
-    public void testRelativeProductionFilePath() {
-        assertEquals(sut.getRelativeProductionFilePath(), relativePath);
+    public void testFilePathWithoutSeparatorTest() {
+        path = "file.extension";
+        assertThrows(IllegalArgumentException.class, () -> new TestFile(app, path, path));
     }
 
     @Test
-    public void testProductionFileName() {
-        assertEquals(sut.getProductionFileName(), filename);
+    public void testFileWithoutExtension() {
+        path = app + File.separator + "to" + File.separator + "fileWithoutExtension";
+        assertThrows(IllegalArgumentException.class, () -> new TestFile(app, path, path));
     }
 
     @Test
-    public void testProductionFileNameWithoutExtension() {
-        assertEquals(sut.getProductionFileNameWithoutExtension(), filename);
+    public void testEmptyAppName() {
+        path = "to" + File.separator + "fileWithoutExtension";
+        assertThrows(IllegalArgumentException.class, () -> new TestFile("", path, path));
     }
 }

src/test/java/edu/rit/se/testsmells/testsmell/TestSmellDetectorTest.java

@@ -54,6 +54,10 @@ public TestFileStub(String app, String testFilePath, String productionFilePath)
             super(app, testFilePath, productionFilePath);
         }
 
+        @Override
+        protected void checkValidity(String testPath, String prodPath, String app) {
+        }
+
         @Override
         public String getTestFileNameWithoutExtension() {
             return "";