Simplify NoTestsPlugin

nygrenh · nygrenh · commit bbcfc53718d9 · 2016-12-07T14:39:30.000+02:00
diff --git a/tmc-langs-notests/src/main/java/fi/helsinki/cs/tmc/langs/NoTestsPlugin.java b/tmc-langs-notests/src/main/java/fi/helsinki/cs/tmc/langs/NoTestsPlugin.java
@@ -74,9 +74,9 @@ public String getPluginName() {
 
     @Override
     public Optional<ExerciseDesc> scanExercise(Path path, String exerciseName) {
-        TestDesc test = new TestDesc(getExerciseName(path) + "Test", getPoints(path));
+        TestDesc test = new TestDesc(exerciseName + "Test", getPoints(path));
         return Optional.of(
-                new ExerciseDesc(getExerciseName(path), ImmutableList.<TestDesc>of(test)));
+                new ExerciseDesc(exerciseName, ImmutableList.<TestDesc>of(test)));
     }
 
     private ImmutableList<String> getPoints(Path path) {
@@ -115,11 +115,4 @@ public Map<File, List<ValidationError>> getValidationErrors() {
 
     @Override
     public void clean(Path path) {}
-
-    private String getExerciseName(Path path) {
-        if (!getConfiguration(path).isSet("no-tests.exercise_name")) {
-            return "DefaultName";
-        }
-        return getConfiguration(path).get("no-tests.exercise_name").asString();
-    }
 }
diff --git a/tmc-langs-notests/src/test/java/fi/helsinki/cs/tmc/langs/NoTestsPluginTest.java b/tmc-langs-notests/src/test/java/fi/helsinki/cs/tmc/langs/NoTestsPluginTest.java
@@ -23,8 +23,7 @@ public NoTestsPluginTest() {
 
     @Test
     public void readsConfigsProperly() {
-        Path project = TestUtils.getPath(getClass(), "notests");
-        System.out.println(project.toAbsolutePath().toString());
+        Path project = TestUtils.getPath(getClass(), "notests-points");
         assertTrue(plugin.isExerciseTypeCorrect(project));
         ExerciseDesc desc = plugin.scanExercise(project, "No Tests Exercise").get();
         assertEquals(1, desc.tests.size());
@@ -35,4 +34,15 @@ public void readsConfigsProperly() {
         RunResult runResult = plugin.runTests(project);
         assertEquals(RunResult.Status.PASSED, runResult.status);
     }
+
+    @Test
+    public void worksWithoutPoints() {
+        Path project = TestUtils.getPath(getClass(), "notests");
+        assertTrue(plugin.isExerciseTypeCorrect(project));
+        ExerciseDesc desc = plugin.scanExercise(project, "No Tests Exercise").get();
+        assertEquals(1, desc.tests.size());
+        assertEquals(0, desc.tests.get(0).points.size());
+        RunResult runResult = plugin.runTests(project);
+        assertEquals(RunResult.Status.PASSED, runResult.status);
+    }
 }
diff --git a/tmc-langs-notests/src/test/resources/.Rprofile b/tmc-langs-notests/src/test/resources/.Rprofile
diff --git a/tmc-langs-notests/src/test/resources/notests-points/.tmcproject.yml b/tmc-langs-notests/src/test/resources/notests-points/.tmcproject.yml
@@ -0,0 +1,4 @@
+no-tests:
+  points:
+    - 1
+    - notests
diff --git a/tmc-langs-notests/src/test/resources/notests-points/nbproject/project.properties b/tmc-langs-notests/src/test/resources/notests-points/nbproject/project.properties
@@ -0,0 +1,10 @@
+auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
+browser.autorefresh.Chrome.INTEGRATED=true
+browser.highlightselection.Chrome.INTEGRATED=true
+file.reference.01_AsciiArtist-src=src
+file.reference.01_AsciiArtist-test=test
+files.encoding=UTF-8
+site.root.folder=${file.reference.notests-src}
+start.file=index.html
+test.folder=${file.reference.notests-test}
+web.context.root=/notests
diff --git a/tmc-langs-notests/src/test/resources/notests-points/nbproject/project.xml b/tmc-langs-notests/src/test/resources/notests-points/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.web.clientproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/clientside-project/1">
+            <name>notests</name>
+        </data>
+    </configuration>
+</project>
diff --git a/tmc-langs-notests/src/test/resources/notests-points/src/index.html b/tmc-langs-notests/src/test/resources/notests-points/src/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Oh noes, more lemmings!</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    </head>
+    <body>
+
+        <p>solution space, hello world! :)</p>
+
+    </body>
+</html>
diff --git a/tmc-langs-notests/src/test/resources/notests/.tmcproject.yml b/tmc-langs-notests/src/test/resources/notests/.tmcproject.yml
@@ -1,5 +1 @@
-no-tests:
-  exercise_name: "No Tests Exercise"
-  points:
-    - 1
-    - notests
+no-tests: true

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +no-tests:
 +  points:
 +    - 1
 +    - notests