Deprecated getLanguageName. Added getPluginName.

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/AbstractLanguagePlugin.java

@@ -59,6 +59,11 @@ public AbstractLanguagePlugin(ExerciseBuilder exerciseBuilder,
 
     public abstract ValidationResult checkCodeStyle(Path path);
 
+    @Override
+    public String getLanguageName() {
+        return getPluginName();
+    }
+
     @Override
     public void prepareSubmission(Path submissionPath, Path destPath) {
         submissionProcessor.setStudentFilePolicy(getStudentFilePolicy(destPath));

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/LanguagePlugin.java

@@ -26,11 +26,17 @@
  */
 public interface LanguagePlugin {
 
+    /**
+     * Returns the name of the plug-in.
+     *
+     */
+    String getPluginName();
+
     /**
      * Returns the name of the programming language supported by this plug-in.
      *
-     * @return The name of the language supported by this plug-in.
      */
+    @Deprecated
     String getLanguageName();
 
     /**

tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/AbstractLanguagePluginTest.java

@@ -62,6 +62,11 @@ public RunResult runTests(Path path) {
         public ValidationResult checkCodeStyle(Path path) {
             return null;
         }
+
+        @Override
+        public String getPluginName() {
+            return null;
+        }
     }
 
     private LanguagePlugin plugin;

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/ant/AntPlugin.java

@@ -60,7 +60,7 @@ public AntPlugin() {
     }
 
     @Override
-    public String getLanguageName() {
+    public String getPluginName() {
         return "apache-ant";
     }
 

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/maven/MavenPlugin.java

@@ -49,7 +49,7 @@ public boolean isExerciseTypeCorrect(Path path) {
     }
 
     @Override
-    public String getLanguageName() {
+    public String getPluginName() {
         return "apache-maven";
     }
 

tmc-langs-java/src/test/java/fi/helsinki/cs/tmc/langs/java/AbstractJavaPluginTest.java

@@ -81,6 +81,11 @@ protected StudentFilePolicy getStudentFilePolicy(Path projectPath) {
         public String getLanguageName() {
             return null;
         }
+
+        @Override
+        public String getPluginName() {
+            return null;
+        }
     }
 
     private PluginImplLanguagePlugin pluginImpl;
@@ -111,8 +116,8 @@ public void testCheckCodeStyleWithUntestableProject() {
     @Test
     public void exceptionOnGetClassPathReturnsAbsentDuringScanExercise() {
         Path path = TestUtils.getPath(getClass(), "trivial");
-        AbstractJavaPlugin plugin =
-                new StubLanguagePlugin(path) {
+        AbstractJavaPlugin plugin
+                = new StubLanguagePlugin(path) {
                     @Override
                     public boolean isExerciseTypeCorrect(Path path) {
                         return true;
@@ -129,11 +134,11 @@ protected ClassPath getProjectClassPath(Path path) throws IOException {
 
     @Test
     public void testRunnerExceptionDuringRunTestsReturnsNull() {
-        AbstractJavaPlugin plugin =
-                new StubLanguagePlugin(Paths.get("")) {
+        AbstractJavaPlugin plugin
+                = new StubLanguagePlugin(Paths.get("")) {
                     @Override
                     protected File createRunResultFile(Path path)
-                            throws TestRunnerException, TestScannerException {
+                    throws TestRunnerException, TestScannerException {
                         throw new TestRunnerException();
                     }
                 };
@@ -143,11 +148,11 @@ protected File createRunResultFile(Path path)
 
     @Test
     public void testScannerExceptionDuringRunTestsReturnsNull() {
-        AbstractJavaPlugin plugin =
-                new StubLanguagePlugin(Paths.get("")) {
+        AbstractJavaPlugin plugin
+                = new StubLanguagePlugin(Paths.get("")) {
                     @Override
                     protected File createRunResultFile(Path path)
-                            throws TestRunnerException, TestScannerException {
+                    throws TestRunnerException, TestScannerException {
                         throw new TestScannerException();
                     }
                 };
@@ -166,23 +171,23 @@ public void scanExerciseReturnsAbsentOnInvalidProject() {
     public void scanExerciseAddsSourceFilesFromProject() {
         Path path = TestUtils.getPath(getClass(), "trivial");
         TestScanner scanner = mock(TestScanner.class);
-        AbstractJavaPlugin plugin =
-                new StubLanguagePlugin(
+        AbstractJavaPlugin plugin
+                = new StubLanguagePlugin(
                         Paths.get(""), new StudentFileAwareSubmissionProcessor(), scanner) {
-                    public boolean isExerciseTypeCorrect(Path path) {
-                        return true;
-                    }
-                };
-        ArgumentCaptor<SourceFiles> sourceFilesCaptor = ArgumentCaptor.forClass(SourceFiles.class);
+                            public boolean isExerciseTypeCorrect(Path path) {
+                                return true;
+                            }
+                        };
+                ArgumentCaptor<SourceFiles> sourceFilesCaptor = ArgumentCaptor.forClass(SourceFiles.class);
 
-        plugin.scanExercise(path, "trivial");
+                plugin.scanExercise(path, "trivial");
 
-        verify(scanner).findTests(any(ClassPath.class), sourceFilesCaptor.capture(), anyString());
+                verify(scanner).findTests(any(ClassPath.class), sourceFilesCaptor.capture(), anyString());
 
-        SourceFiles sourceFiles = sourceFilesCaptor.getValue();
-        File expected = TestUtils.getPath(getClass(), "trivial/test/TrivialTest.java").toFile();
+                SourceFiles sourceFiles = sourceFilesCaptor.getValue();
+                File expected = TestUtils.getPath(getClass(), "trivial/test/TrivialTest.java").toFile();
 
-        assertFalse(sourceFiles.getSources().isEmpty());
-        assertTrue(sourceFiles.getSources().contains(expected));
+                assertFalse(sourceFiles.getSources().isEmpty());
+                assertTrue(sourceFiles.getSources().contains(expected));
     }
 }

tmc-langs-make/src/main/java/fi/helsinki/cs/tmc/langs/make/MakePlugin.java

@@ -63,7 +63,7 @@ public MakePlugin() {
     }
 
     @Override
-    public String getLanguageName() {
+    public String getPluginName() {
         return "make";
     }
 

tmc-langs-python3/src/main/java/fi/helsinki/cs/tmc/langs/python3/Python3Plugin.java

@@ -68,7 +68,7 @@ protected StudentFilePolicy getStudentFilePolicy(Path projectPath) {
     }
 
     @Override
-    public String getLanguageName() {
+    public String getPluginName() {
         return "python3";
     }