Made TestScanner initializion lazy to avoid issues with systems not having java compiler and working on non java course

Author: jamo

build-tools/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.2-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>

tmc-langs-cli/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tmc-langs-framework/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.2-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>

tmc-langs-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.2-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/AbstractJavaPlugin.java

@@ -46,13 +46,13 @@ public abstract class AbstractJavaPlugin extends AbstractLanguagePlugin {
 
     private final TestResultParser resultParser = new TestResultParser();
     private final Path testFolderPath;
-    private final TestScanner testScanner;
+    private final LazyTestScanner testScanner;
 
     /**
      * Creates a new AbstractJavaPlugin.
      */
     public AbstractJavaPlugin(
-            Path testFolderPath, SubmissionProcessor submissionProcessor, TestScanner testScanner) {
+            Path testFolderPath, SubmissionProcessor submissionProcessor, LazyTestScanner testScanner) {
         super(
                 new ExerciseBuilder(),
                 submissionProcessor,
@@ -108,13 +108,14 @@ public Optional<ExerciseDesc> scanExercise(Path path, String exerciseName) {
             stb.append(cp.toString());
             stb.append(":");
         }
-        testScanner.setClassPath(stb.toString());
+        TestScanner scanner = testScanner.get();
+        scanner.setClassPath(stb.toString());
         for (File sourceFile : sourceFiles.getSources()) {
-            testScanner.addSource(sourceFile);
+            scanner.addSource(sourceFile);
         }
 
-        List<TestMethod> tests = testScanner.findTests();
-        testScanner.clearSources();
+        List<TestMethod> tests = scanner.findTests();
+        scanner.clearSources();
 
         return Optional.of(ExerciseDesc.from(exerciseName, tests));
     }

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/LazyTestScanner.java

@@ -0,0 +1,18 @@
+package fi.helsinki.cs.tmc.langs.java;
+
+import fi.helsinki.cs.tmc.testscanner.TestScanner;
+
+/**
+ * Creates testscanner only when needed, to avoid issues whre no java compiler is present.
+ */
+public class LazyTestScanner {
+
+    private TestScanner testScanner;
+
+    public TestScanner get() {
+        if (this.testScanner == null) {
+            this.testScanner = new TestScanner();
+        }
+        return this.testScanner;
+    }
+}

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

@@ -7,10 +7,10 @@
 import fi.helsinki.cs.tmc.langs.io.sandbox.StudentFileAwareSubmissionProcessor;
 import fi.helsinki.cs.tmc.langs.java.AbstractJavaPlugin;
 import fi.helsinki.cs.tmc.langs.java.ClassPath;
+import fi.helsinki.cs.tmc.langs.java.LazyTestScanner;
 import fi.helsinki.cs.tmc.langs.java.TestRunFileAndLogs;
 import fi.helsinki.cs.tmc.langs.java.exception.TestRunnerException;
 import fi.helsinki.cs.tmc.langs.java.exception.TestScannerException;
-import fi.helsinki.cs.tmc.testscanner.TestScanner;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -70,7 +70,7 @@ public class AntPlugin extends AbstractJavaPlugin {
      * Create a new AntPlugin.
      */
     public AntPlugin() {
-        super(TEST_DIR, new StudentFileAwareSubmissionProcessor(), new TestScanner());
+        super(TEST_DIR, new StudentFileAwareSubmissionProcessor(), new LazyTestScanner());
     }
 
     @Override

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

@@ -6,6 +6,7 @@
 import fi.helsinki.cs.tmc.langs.io.sandbox.StudentFileAwareSubmissionProcessor;
 import fi.helsinki.cs.tmc.langs.java.AbstractJavaPlugin;
 import fi.helsinki.cs.tmc.langs.java.ClassPath;
+import fi.helsinki.cs.tmc.langs.java.LazyTestScanner;
 import fi.helsinki.cs.tmc.langs.java.TestRunFileAndLogs;
 import fi.helsinki.cs.tmc.langs.java.exception.TestRunnerException;
 import fi.helsinki.cs.tmc.langs.java.exception.TestScannerException;
@@ -41,7 +42,7 @@ public final class MavenPlugin extends AbstractJavaPlugin {
      * Creates a new MavenPlugin.
      */
     public MavenPlugin() {
-        super(TEST_FOLDER, new StudentFileAwareSubmissionProcessor(), new TestScanner());
+        super(TEST_FOLDER, new StudentFileAwareSubmissionProcessor(), new LazyTestScanner());
     }
 
     @Override

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

@@ -44,12 +44,12 @@ private class StubLanguagePlugin extends AbstractJavaPlugin {
         public StubLanguagePlugin(
                 Path testFolderPath,
                 SubmissionProcessor submissionProcessor,
-                TestScanner testScanner) {
+                LazyTestScanner testScanner) {
             super(testFolderPath, submissionProcessor, testScanner);
         }
 
         public StubLanguagePlugin(Path testFolderPath) {
-            super(testFolderPath, new StudentFileAwareSubmissionProcessor(), new TestScanner());
+            super(testFolderPath, new StudentFileAwareSubmissionProcessor(), new LazyTestScanner());
         }
 
         @Override