Pull request fixes

Pull request fixes

Added some fixes

Removed file

fixing pom

Fixed checkstyle

Fix travis

Author: d471061c

tmc-langs-qmake/pom.xml

@@ -7,13 +7,11 @@
         <version>0.7.7-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <tmc.basedir>../target</tmc.basedir>
+    <properties>  
+       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>	
+       <tmc.basedir>../target</tmc.basedir>		
     </properties>
-
+ 
     <artifactId>tmc-langs-qmake</artifactId>
     <packaging>jar</packaging>
 

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

@@ -164,11 +164,7 @@ private List<String> parsePoints(Element testcase) {
             Element desc = (Element) message.getElementsByTagName("Description").item(0);
             String text = desc.getTextContent();
             if (text.matches("^(TMC:.*)")) {
-                String[] split = text.split("\\.");
-                String result = split[1];
-                for (int j = 2; j < split.length; j++) {
-                    result += "." + split[j];
-                }
+                String result = text.substring(text.indexOf(".") + 1);
                 points.add(result);
             }
         }

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

@@ -0,0 +1,11 @@
+
+package fi.helsinki.cs.tmc.langs.qmake;
+
+
+public class QmakeBuildException extends RuntimeException {
+
+    QmakeBuildException(java.lang.Exception exception) {
+        System.err.println(exception);
+    }
+    
+}

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

@@ -129,9 +129,9 @@ public RunResult runTests(Path path) {
                 log.error("Building project with qmake failed: {}", qmakeBuild.errorOutput);
                 return filledFailure(qmakeBuild.errorOutput);
             }
-        } catch (Exception e) {
+        } catch (IOException | InterruptedException e) {
             log.error("Building project with qmake failed", e);
-            throw new RuntimeException(e);
+            throw new QmakeBuildException(e);
         }
 
         try {
@@ -140,9 +140,9 @@ public RunResult runTests(Path path) {
                 log.error("Building project with make failed: {}", makeBuild.errorOutput);
                 return filledFailure(makeBuild.errorOutput);
             }
-        } catch (Exception e) {
+        } catch (IOException | InterruptedException e) {
             log.error("Building project with make failed", e);
-            throw new RuntimeException(e);
+            throw new QmakeBuildException(e);
         }
 
         Path testResults = path.resolve(TMC_TEST_RESULTS);
@@ -160,9 +160,9 @@ public RunResult runTests(Path path) {
                 log.error("Failed to get test output at {}", testResults);
                 return filledFailure(testRun.output);
             }
-        } catch (Exception e) {
+        } catch (IOException | InterruptedException e) {
             log.error("Testing with make check failed", e);
-            throw new RuntimeException(e);
+            throw new QmakeBuildException(e);
         }
 
         QTestResultParser parser = new QTestResultParser();
@@ -197,7 +197,7 @@ private Path makeShadowBuildDir(Path dir) {
         return buildDir.toPath();
     }
 
-    private ProcessResult buildWithQmake(Path dir) throws Exception {
+    private ProcessResult buildWithQmake(Path dir) throws IOException, InterruptedException {
         String qmakeArguments = "CONFIG+=test";
         Path pro = getProFile(dir.getParent());
         String[] qmakeCommand = {"qmake", qmakeArguments, pro.toString()};
@@ -206,7 +206,7 @@ private ProcessResult buildWithQmake(Path dir) throws Exception {
         return run(qmakeCommand, dir);
     }
 
-    private ProcessResult buildWithMake(Path dir) throws Exception {
+    private ProcessResult buildWithMake(Path dir) throws IOException, InterruptedException {
         String[] makeCommand = {"make"};
         log.info("Building project with command {}", Arrays.deepToString(makeCommand));
         return run(makeCommand, dir);
@@ -226,7 +226,7 @@ public void clean(Path path) {
         }
     }
 
-    private ProcessResult run(String[] command, Path dir) throws Exception {
+    private ProcessResult run(String[] command, Path dir) throws IOException, InterruptedException {
         ProcessRunner runner = new ProcessRunner(command, dir);
         return runner.call();
     }

tmc-langs-util/src/main/java/fi/helsinki/cs/tmc/langs/util/ProjectType.java

@@ -7,8 +7,9 @@
 import fi.helsinki.cs.tmc.langs.java.maven.MavenPlugin;
 import fi.helsinki.cs.tmc.langs.make.MakePlugin;
 import fi.helsinki.cs.tmc.langs.python3.Python3Plugin;
-import fi.helsinki.cs.tmc.langs.r.RPlugin;
 import fi.helsinki.cs.tmc.langs.qmake.QmakePlugin;
+import fi.helsinki.cs.tmc.langs.r.RPlugin;
+
 
 
 import org.slf4j.Logger;