Fix issue with library linking when building windows

Fixed issue with library linking when building on Windows

Fixed library linking issue and redundant folder spawning on Windows by
disabling the default enabled debug_and_release debug_and_release_target
CONFIG variable options.

Windows compatibility for passing single lib same point

Fixes to qtplugin

Checkstyle fix

Author: nucularmoo

tmc-langs-qmake/src/main/java/fi/helsinki/cs/tmc/langs/qmake/QTestCase.java

@@ -16,8 +16,8 @@ public final class QTestCase {
     /**
      * Create a test case for QT tests.
      *
-     * @param name
-     * @param passed
+     * @param name Name of the test
+     * @param passed Passed status
      * @param message for failed assertion
      * @param points for test case
      */

tmc-langs-qmake/src/main/java/fi/helsinki/cs/tmc/langs/qmake/QTestResultParser.java

@@ -38,12 +38,15 @@ public final class QTestResultParser {
 
     private static final Logger log = LoggerFactory.getLogger(QTestResultParser.class);
 
-    private final List<TestResult> tests;
+    private List<TestResult> tests;
 
-    public QTestResultParser(Path testResults) {
-        this.tests = parseTestCases(testResults);
+    public QTestResultParser() {
     }
 
+    public void loadTests(Path testResult) {
+        this.tests = parseTestCases(testResult);
+    }
+    
     private List<TestResult> parseTestCases(Path testOutput) {
         Document doc;
         try {
@@ -93,7 +96,7 @@ private Document prepareDocument(Path testOutput)
 
     /**
      * Parses Qt testlib XML output, as generated with -o filename.xml,xml.
-     *
+     * <p>
      * Points are mapped to test cases with Message node type 'qinfo'. These
      * messages contain: prefix "TMC:" test case name: "test_function_name"
      * points separated by period: ".1"
@@ -103,13 +106,15 @@ private Document prepareDocument(Path testOutput)
      *
      * When the testcase assertion(s) has passed, there will be an Incident node
      * with type "pass" and no Description node.
-     *
+     * </p>
      * <TestFunction name="test_function_name">
      * <Message type="qinfo" file="" line="0">
      * <Description><![CDATA[TMC:test_function_name.1]]></Description>
      * </Message>
      * <Incident type="fail" file="test_source.cpp" line="420">
-     * <Description><![CDATA['!strcmp(hello_msg(), "Helo, world!" )' returned FALSE. ()]]></Description>
+     * <Description>
+     * <![CDATA['!strcmp(hello_msg(), "Helo, world!" )' returned FALSE. ()]]>
+     * </Description>
      * </Incident>
      * <Duration msecs="0.135260"/>
      * </TestFunction>
@@ -147,31 +152,31 @@ private List<TestResult> createQtTestResults(NodeList nodeList) {
     }
 
     /**
-     *
+     * <p>
      * Parse potential points from testcase.
-     *
+     * </p>
      */
     private List<String> parsePoints(Element testcase) {
         List<String> points = new ArrayList<>();
         NodeList messages = testcase.getElementsByTagName("Message");
         for (int i = 0; i < messages.getLength(); i++) {
+            // Convert node to element, messages.item(i) returns a node
             Element message = (Element) messages.item(i);
             Element desc = (Element) message.getElementsByTagName("Description").item(0);
             String text = desc.getTextContent();
             if (text.matches("^(TMC:.*)")) {
                 String[] split = text.split("\\.");
-                points.add(split[1]);
+                String result = split[1];
+                for (int j = 2; j < split.length; j++) {
+                    result += "." + split[j];
+                }
+                points.add(result);
             }
         }
 
         return points;
     }
 
-    /**
-     * Returns the test results of the tests in this file.
-     *
-     * @return
-     */
     public List<TestResult> getTestResults() {
         return this.tests;
     }
@@ -189,7 +194,7 @@ private Status getResultStatus() {
     /**
      * Returns the run result of this file.
      *
-     * @return
+     * @return Runresults
      */
     public RunResult result() {
         return new RunResult(

tmc-langs-qmake/src/main/java/fi/helsinki/cs/tmc/langs/qmake/QmakePlugin.java

@@ -49,11 +49,13 @@ public final class QmakePlugin extends AbstractLanguagePlugin {
 
     private static final Path TMC_TEST_RESULTS = Paths.get("tmc_test_results.xml");
 
-    // POINT(exercise_name, 1)
+    // Finds pattern 'POINT(exercise_name, 1)'
     private static final Pattern POINT_PATTERN
             = Pattern.compile("POINT\\(\\s*(\\w+),\\s*(\\w+)\\s*\\)\\s*;");
+    // Pattern to find comments
     private static final Pattern COMMENT_PATTERN
-            = Pattern.compile("(^[^\"\\r\\n]*\\/\\*{1,2}.*?\\*\\/|(^[^\"\\r\\n]*\\/\\/[^\\r\\n]*))", Pattern.MULTILINE | Pattern.DOTALL);
+            = Pattern.compile("(^[^\"\\r\\n]*\\/\\*{1,2}.*?\\*\\/"
+                    + "|(^[^\"\\r\\n]*\\/\\/[^\\r\\n]*))", Pattern.MULTILINE | Pattern.DOTALL);
 
     private static final RunResult EMPTY_FAILURE
             = new RunResult(
@@ -84,8 +86,7 @@ public String getPluginName() {
      * be named after the directory.
      */
     private Path getProFile(Path basePath) {
-        Path proFile = new File(basePath.toFile().getName() + ".pro").toPath();
-        return basePath.resolve(proFile);
+        return Paths.get(basePath.toString() + "/" + basePath.getFileName() + ".pro");
     }
 
     @Override
@@ -115,7 +116,7 @@ public boolean isExerciseTypeCorrect(Path path) {
      * <p>
      * The project root path must be specified for the {@link StudentFilePolicy}
      * to read any configuration files such as <tt>.tmcproject.yml</tt>.
-     *
+     * </p>
      * @param projectPath The project's root path
      */
     @Override
@@ -144,24 +145,25 @@ public RunResult runTests(Path path) {
                 log.error("Failed to get test output at {}", testResults);
                 return filledFailure(test.get());
             }
-
-            return new QTestResultParser(testResults).result();
+            QTestResultParser parser = new QTestResultParser();
+            parser.loadTests(testResults);
+            return parser.result();
         }
 
         return EMPTY_FAILURE;
     }
 
     private Optional<RunResult> build(Path path) {
-        Optional<RunResult> result = buildWithQmake(path);
-        if (result.isPresent()) {
+        Optional<RunResult> error = buildWithQmake(path);
+        if (error.isPresent()) {
             log.warn("Failed to compile project with qmake");
-            return result;
+            return error;
         }
 
-        result = buildWithMake(path);
-        if (result.isPresent()) {
+        error = buildWithMake(path);
+        if (error.isPresent()) {
             log.warn("Failed to compile project with make");
-            return result;
+            return error;
         }
 
         return Optional.absent();
@@ -199,12 +201,12 @@ private Optional<RunResult> buildWithMake(Path dir) {
         return checkBuildResult(result);
     }
 
-    private Optional<RunResult> checkBuildResult(Optional<ProcessResult> result) {
-        if (result.isPresent()) {
-            if (result.get().statusCode == 0) {
+    private Optional<RunResult> checkBuildResult(Optional<ProcessResult> error) {
+        if (error.isPresent()) {
+            if (error.get().statusCode == 0) {
                 return Optional.absent();
             }
-            return Optional.of(filledFailure(result.get()));
+            return Optional.of(filledFailure(error.get()));
         }
         return Optional.of(EMPTY_FAILURE);
     }
@@ -216,7 +218,6 @@ public void clean(Path path) {
             log.info("Cleaned project");
         } else {
             log.warn("Cleaning project was not successful");
-
         }
     }
 
@@ -225,11 +226,12 @@ private Optional<ProcessResult> run(String[] command, Path dir) {
 
         try {
             return Optional.of(runner.call());
-        } catch (Exception e) {
+        } catch (IOException | InterruptedException e) {
             log.error("Running command {} failed {}", Arrays.deepToString(command), e);
+            return Optional.absent();
         }
 
-        return Optional.absent();
+        
     }
 
     private RunResult filledFailure(ProcessResult processResult) {
@@ -244,13 +246,13 @@ private RunResult filledFailure(ProcessResult processResult) {
     /**
      * TODO: This is copy paste from tmc-langs regex branch. Regex branch method
      * 'availablePoints' does not parse test names at this time.
-     *
+     * <p>
      * POINT_PATTERN matches the #define macro in the tests, for example:
      *
      * POINT(test_name2, suite_point);
      *
      * POINT(test_name, 1);
-     *
+     * </p>
      * etc.
      */
     public Optional<ImmutableList<TestDesc>> availablePoints(final Path rootPath) {
@@ -282,7 +284,6 @@ protected Optional<ImmutableList<TestDesc>> findAvailablePoints(final Path rootP
             }
             return Optional.of(ImmutableList.copyOf(descs));
         } catch (IOException e) {
-            // We could scan the exercise but that could be a security risk
             return Optional.absent();
         }
     }

tmc-langs-qmake/src/test/java/fi/helsinki/cs/tmc/langs/qmake/QTestResultParserTest.java

@@ -1,16 +1,22 @@
 package fi.helsinki.cs.tmc.langs.qmake;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.langs.domain.TestResult;
 import fi.helsinki.cs.tmc.langs.utils.TestUtils;
+
+import org.junit.Test;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class QTestResultParserTest {
 
@@ -20,14 +26,16 @@ public class QTestResultParserTest {
 
     public QTestResultParserTest() {
         passing = new QTestCase("passing", true, "Passed", Arrays.asList(new String[]{"1"}));
-        failing = new QTestCase("failing", false, "This test should've failed", Arrays.asList(new String[]{"2"}));
+        failing = new QTestCase("failing", false, "This test should've failed", 
+                                 Arrays.asList(new String[]{"2"}));
         another = new QTestCase("another", true, "Passed", Arrays.asList(new String[]{"3"}));
     }
 
     @Test(expected = IllegalStateException.class)
     public void testParsingWithNoTests() throws Exception {
-        Path empty_test_output = TestUtils.initTempFileWithContent("empty_test_output", "xml", "");
-        QTestResultParser qtparser = new QTestResultParser(empty_test_output);
+        Path emptyTestOutput = TestUtils.initTempFileWithContent("empty_test_output", "xml", "");
+        QTestResultParser qtparser = new QTestResultParser();
+        qtparser.loadTests(emptyTestOutput);
         assertTrue(qtparser.getTestResults().isEmpty());
     }
 
@@ -136,7 +144,10 @@ private QTestResultParser createResultParser(List<QTestCase> testCases) {
         } catch (Exception e) {
             fail("Error creating or parsing output file: " + e.getMessage());
         }
-        return new QTestResultParser(testPath);
+        QTestResultParser qtparser = new QTestResultParser();
+        qtparser.loadTests(testPath);
+        
+        return qtparser;
     }
 
     private Path constructTestOutput(List<QTestCase> testCases) throws IOException {
@@ -148,7 +159,9 @@ private Path constructTestOutput(List<QTestCase> testCases) throws IOException {
             pw.println("<TestFunction name=\"" + t.getName() + "\">");
             for (String point : t.getPoints()) {
                 pw.println("<Message type=\"qinfo\" file=\"\" line=\"0\">");
-                pw.println("<Description><![CDATA[TMC:" + t.getName() + "." + point + "]]></Description>");
+                pw.println("<Description><![CDATA[TMC:" + t.getName() 
+                        + "." + point 
+                        + "]]></Description>");
                 pw.println("</Message>");
             }
 

tmc-langs-qmake/src/test/java/fi/helsinki/cs/tmc/langs/qmake/QmakePluginTest.java

@@ -1,16 +1,19 @@
 package fi.helsinki.cs.tmc.langs.qmake;
 
-import com.google.common.base.Optional;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import fi.helsinki.cs.tmc.langs.domain.ExerciseDesc;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.langs.utils.TestUtils;
 
+import com.google.common.base.Optional;
+
 import org.junit.Test;
 
 import java.nio.file.Path;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
 
 public class QmakePluginTest {
 

tmc-langs-qmake/src/test/resources/failing_compile_single_lib_compiling/failing_compile_single_lib_compiling.pro

@@ -1,10 +1,3 @@
-#This additional CONFIG variable option will allow libraries
-#to be correctly linked when building projects using Windows.
-
-win32 {
-    CONFIG -= debug_and_release debug_and_release_target
-}
-
 TEMPLATE = subdirs
 SUBDIRS += \
 	test_case_app \

tmc-langs-qmake/src/test/resources/failing_compile_single_lib_compiling/test_case_app/test_case_app.pro

@@ -3,6 +3,10 @@ QT -= gui
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
+win32 {
+    CONFIG -= debug_and_release debug_and_release_target
+}
+
 DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += main.cpp

tmc-langs-qmake/src/test/resources/failing_compile_single_lib_compiling/test_case_lib/test_case_lib.pro

@@ -4,6 +4,10 @@ TARGET = test_case_lib
 TEMPLATE = lib
 CONFIG += staticlib
 
+win32 {
+    CONFIG -= debug_and_release debug_and_release_target
+}
+
 DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \

tmc-langs-qmake/src/test/resources/failing_compile_single_lib_compiling/test_case_test_runner/test_case_test_runner.pro

@@ -4,6 +4,10 @@ QT -= gui
 CONFIG += c++11 console testcase
 CONFIG -= app_bundle
 
+win32 {
+    CONFIG -= debug_and_release debug_and_release_target
+}
+
 DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += main.cpp \

tmc-langs-qmake/src/test/resources/failing_nolib/failing_nolib.pro

@@ -1,10 +1,3 @@
-#This additional CONFIG variable option will allow libraries
-#to be correctly linked when building projects using Windows.
-
-win32 {
-    CONFIG -= debug_and_release debug_and_release_target
-}
-
 TEMPLATE = subdirs
 SUBDIRS += \
 	test_case_app \