From 0eb2fc8b59161f2ed769d6d7b3a81676ec2d69a7 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 16 Jun 2016 09:40:51 +0200
Subject: [PATCH] Clean up the mess
---
.../Sd1/SoSe2015/StringFunctions/.gitignore | 4 +
.../Sd1/SoSe2015/StringFunctions/pom.xml | 47 ++++--
.../sw1/klausur/StringTransforms.java | 4 +-
.../mi/bitte_ignorieren/Marking.java | 14 --
.../mi/bitte_ignorieren/MarkingTest.java | 29 ----
.../mi/bitte_ignorieren/ResultCollector.java | 147 ------------------
.../mi/bitte_ignorieren/TestResult.java | 19 ---
.../mi/bitte_ignorieren/eval/Aufgabe.java | 29 ----
.../sw1/klausur/test/GetMarks.java | 10 ++
.../klausur/test/Test_MorseExceptions.java | 13 +-
.../klausur/test/Test_StringTransforms.java | 12 +-
.../SoSe2015/StringFunctions_Solution/pom.xml | 8 +
Klausuren/Sd1/Ws2015/Exam/pom.xml | 29 ++--
.../sw1/klausur/test/Test_Helper.java | 2 +-
.../klausur/test/Test_SpielNaechsteRunde.java | 2 +-
Klausuren/Sd1/Ws2015/Solution/pom.xml | 10 +-
16 files changed, 90 insertions(+), 289 deletions(-)
create mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/.gitignore
delete mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
delete mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
delete mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
delete mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
delete mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Aufgabe.java
create mode 100644 Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/.gitignore b/Klausuren/Sd1/SoSe2015/StringFunctions/.gitignore
new file mode 100644
index 000000000..e151921e1
--- /dev/null
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.project
+/.settings
+/A1.log
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/pom.xml b/Klausuren/Sd1/SoSe2015/StringFunctions/pom.xml
index 77f6ee743..bac6d3003 100644
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/pom.xml
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions/pom.xml
@@ -3,22 +3,30 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm-stuttgart.sw1.klausur</groupId>
- <artifactId>sw1klausur</artifactId>
+ <artifactId>sw1_2015sommer</artifactId>
<version>0.9</version>
<packaging>jar</packaging>
- <name>sw1klausur</name>
- <url>http://maven.apache.org</url>
+ <name>sw1_2015sommer</name>
+ <url>https://freedocs.mi.hdm-stuttgart.de</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -31,20 +39,27 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>de.hdm_stuttgart.mi.exam</groupId>
+ <artifactId>unitmarking</artifactId>
+ <version>0.9</version>
+ </dependency>
+
</dependencies>
</project>
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
index 90462942a..c8767ce85 100644
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
@@ -4,7 +4,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
- * @author goik
+ * Ersetzungen in Zeichenketten.
*
*/
public class StringTransforms {
@@ -30,7 +30,7 @@ public class StringTransforms {
log.info("Bei Bedarf zur Fehlersuche logging Statements nutzen");
- return "Blödsinn";// TODO implement me
+ return "Blödsinn";// TODO implementiere mich
}
/**
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
deleted file mode 100644
index b9b00c7cf..000000000
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Retention( value = RetentionPolicy.RUNTIME)
-@Target( value = { ElementType.METHOD})
-public @interface Marking {
-
- int points ();
-}
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
deleted file mode 100644
index fe99181ad..000000000
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import org.junit.AfterClass;
-import org.junit.Rule;
-import org.junit.runner.Description;
-
-public class MarkingTest {
-
- static public Description currentTestClass = null;
-
- static public boolean provideExtraInfo = false;
-
- public final static ResultCollector globalresultCollector = new ResultCollector();
-
- @Rule
- public ResultCollector collectedResults = globalresultCollector;
-
- @AfterClass public static void showResults() {
- if (provideExtraInfo) {
- System.out.println("Local:----------------------------------");
- System.out.println(globalresultCollector.currentToString());
- System.out.println("Global:++++++++++++++++++++++++++++++++++");
- System.out.println("Global:++++++++++++++++++++++++++++++++++");
- System.out.println(globalresultCollector.toString());
- System.out.println("Global:++++++++++++++++++++++++++++++++++");
- System.out.println("Global:++++++++++++++++++++++++++++++++++");
- }
- }
-}
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
deleted file mode 100644
index 32c6f036b..000000000
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import java.lang.annotation.Annotation;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Vector;
-
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-
-public class ResultCollector extends TestWatcher {
-
- public final Map<String, List<TestResult>>
- failedByDescription = new HashMap<String, List<TestResult>>(),
- successByDescription = new HashMap<String, List<TestResult>>();
-
- @Override
- protected void starting(Description description) {
- MarkingTest.currentTestClass = description;
- }
-
- @Override
- protected void failed(final Throwable e, final Description description) {
- putAppend(failedByDescription, description.getClassName(), new TestResult(description,
- getMarking(description), false));
- }
-
- @Override
- protected void succeeded(final Description description) {
- putAppend(successByDescription, description.getClassName(), new TestResult(description,
- getMarking(description), true));
- }
-
- private static void putAppend(final Map<String, List<TestResult>> map, final String key, final TestResult testresult) {
- List<TestResult> results = map.get(key);
- if (null == results) {
- results = new Vector<TestResult>();
- map.put(key, results);
- }
- results.add(testresult);
- }
- private static Marking getMarking(final Description description) {
-
- final Marking marking = description.getAnnotation(Marking.class);
- if (null == marking) { // Default values: 1 point
- return new Marking() {
-
- @Override
- public Class<? extends Annotation> annotationType() {
- return Marking.class;
- }
-
- @Override
- public int points() {
- return 1;
- }
- };
-
- }
- return marking;
- }
-
- public String currentToString() {
-
- final String currentTestClassName = MarkingTest.currentTestClass.getClassName();
-
- int reachablePoints = 0, reachedPoints = 0, numSuccessfulTests = 0;
-
- final List<TestResult> successfulTestResults = successByDescription.get(currentTestClassName);
-
- if (null != successfulTestResults) {
- for (final TestResult t : successfulTestResults) {
- reachablePoints += t.marking.points();
- reachedPoints += t.marking.points();
- numSuccessfulTests++;
- }
- }
-
- final StringBuffer failBuffer = new StringBuffer();
-
- final List<TestResult> failedTestResults = failedByDescription.get(currentTestClassName);
-
- if (null != failedTestResults) {
- for (final TestResult t : failedTestResults) {
- reachablePoints += t.marking.points();
- failBuffer.append(" -" + t.testMethodDisplayName + "\n");
- }
- }
-
- final StringBuffer buffer = new StringBuffer();
-
- buffer.append(currentTestClassName + ":\nYou have reached " + reachedPoints + " of "
- + reachablePoints + " possible points in " + numSuccessfulTests + " successful tests. ");
-
- if (null != failedTestResults) {
-
- final int numFailed = failedTestResults.size();
- if (1 == numFailed) {
- buffer.append(" The following test still fails:\n");
- } else if (1 < numFailed) {
- buffer.append("\n\nThe following " + numFailed + " tests still fail:\n");
- }
- buffer.append(failBuffer + "\n");
- }
- buffer.append("\n");
- return buffer.toString();
- }
-
- @Override
- public String toString() {
-
- int reachablePoints = 0, reachedPoints = 0, successfulTests = 0, failedTests = 0;
-
- for (final Entry<String, List<TestResult>> successEntries: successByDescription.entrySet()) {
- for (final TestResult t : successEntries.getValue()) {
- successfulTests++;
- reachablePoints += t.marking.points();
- reachedPoints += t.marking.points();
- }
- }
-
- final StringBuffer failBuffer = new StringBuffer();
- for (final Entry<String, List<TestResult>> failEntries: failedByDescription.entrySet()) {
- for (final TestResult t : failEntries.getValue()) {
- failedTests++;
- reachablePoints += t.marking.points();
- failBuffer.append(" -" + t.testMethodDisplayName + "\n");
- }
- }
-
- final StringBuffer buffer = new StringBuffer();
-
- buffer.append("You have reached " + reachedPoints + " of "
- + reachablePoints + " possible points in "
- + successfulTests + " successful tests\n");
- if (1 == failedTests) {
- buffer.append("\n\nThe following test still fails:\n");
- } else if (1 < failedTests) {
- buffer.append("\n\nThe following " + failedTests
- + " tests still fail:\n");
- }
- buffer.append(failBuffer + "\n");
- return buffer.toString();
- }
-}
\ No newline at end of file
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
deleted file mode 100644
index d32e9e9de..000000000
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import org.junit.runner.Description;
-
-public class TestResult {
-
- public final Description testMethodDisplayName;
- public final Marking marking;
- public final boolean success;
-
- public TestResult(final Description testMethodDisplayName,
- final Marking marking,
- final boolean success) {
-
- this.testMethodDisplayName = testMethodDisplayName;
- this.marking = marking;
- this.success = success;
- }
-}
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Aufgabe.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Aufgabe.java
deleted file mode 100644
index 661949871..000000000
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Aufgabe.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren.eval;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
-import de.hdm_stuttgart.sw1.klausur.test.Test_MorseExceptions;
-import de.hdm_stuttgart.sw1.klausur.test.Test_StringTransforms;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- Test_StringTransforms.class,
- Test_MorseExceptions.class,
-})
-
-public class Aufgabe {
-
- @BeforeClass public static void init() {
- MarkingTest.provideExtraInfo = true;
- }
-
- @AfterClass public static void showResults() {
- System.out.println("---final------------------");
- System.out.println(MarkingTest.globalresultCollector.toString());
- }
-
-}
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java
new file mode 100644
index 000000000..40acad937
--- /dev/null
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java
@@ -0,0 +1,10 @@
+package de.hdm_stuttgart.sw1.klausur.test;
+
+import de.hdm_stuttgart.mi.exam.unitmarking.RunTests;
+
+public class GetMarks {
+
+ public static void main(String[] args) {
+ RunTests.exec(Test_StringTransforms.class, Test_MorseExceptions.class);
+ }
+}
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
index 37550b957..8c238b1a7 100644
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
@@ -1,15 +1,20 @@
package de.hdm_stuttgart.sw1.klausur.test;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
+
+import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.bitte_ignorieren.Marking;
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
import static de.hdm_stuttgart.sw1.klausur.StringTransforms.morsen;
@SuppressWarnings({"static-method", "javadoc"})
-public class Test_MorseExceptions extends MarkingTest {
-
+public class Test_MorseExceptions {
+
+ @Rule // Kill test if lasting longer than 1000 milliseconds
+ public Timeout globalTimeout = Timeout.seconds(1);
+
@Test
@Marking(points=5)
public void morsen_Exception () {
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
index ceb88a6ec..2fd1be965 100644
--- a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
@@ -1,17 +1,21 @@
package de.hdm_stuttgart.sw1.klausur.test;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
+
+import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
-import de.hdm_stuttgart.mi.bitte_ignorieren.Marking;
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
import static de.hdm_stuttgart.sw1.klausur.StringTransforms.chinesischerAkzent;
import static de.hdm_stuttgart.sw1.klausur.StringTransforms.entferneVokale;
import static de.hdm_stuttgart.sw1.klausur.StringTransforms.morsen;
-@SuppressWarnings({"static-method", "javadoc"})
-public class Test_StringTransforms extends MarkingTest {
+@SuppressWarnings({"javadoc"})
+public class Test_StringTransforms {
+ @Rule // Kill test if lasting longer than 1000 milliseconds
+ public Timeout globalTimeout = Timeout.seconds(1);
// Tests zu chinesischerAkzent(final String input)
//
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml b/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml
index f2989d972..6af04e848 100644
--- a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml
+++ b/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml
@@ -13,6 +13,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
+ </repository>
+ </repositories>
+
<build>
<plugins>
diff --git a/Klausuren/Sd1/Ws2015/Exam/pom.xml b/Klausuren/Sd1/Ws2015/Exam/pom.xml
index 3da80d61f..2bcbd5b23 100644
--- a/Klausuren/Sd1/Ws2015/Exam/pom.xml
+++ b/Klausuren/Sd1/Ws2015/Exam/pom.xml
@@ -3,29 +3,22 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm-stuttgart.sw1.klausur</groupId>
- <artifactId>sw1_ws2015</artifactId>
+ <artifactId>sw1_2015winter</artifactId>
<version>0.9</version>
<packaging>jar</packaging>
- <name>sw1_ws2015</name>
- <url>http://maven.apache.org</url>
+ <name>sw1_2015winter</name>
+ <url>https://freedocs.mi.hdm-stuttgart.de</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <id>YourId</id>
- <name>YourName</name>
- <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
- <layout>default</layout>
- </repository>
+ <repositories>
+ <repository>
+ <id>hdm-mi-internal-maven-repo</id>
+ <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
+ </repository>
</repositories>
<build>
@@ -56,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -78,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -92,7 +85,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
</dependency>
<dependency>
diff --git a/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_Helper.java b/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_Helper.java
index a5fbfef09..3618ff91b 100644
--- a/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_Helper.java
+++ b/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_Helper.java
@@ -12,7 +12,7 @@ import static de.hdm_stuttgart.sw1.klausur.Helper.*;
public class Test_Helper {
@Rule // Kill test if lasting longer than 1000 milliseconds
- public Timeout globalTimeout = new Timeout(1000);
+ public Timeout globalTimeout = Timeout.seconds(1);
// Abschnitt getHaeufigkeit
@Test
diff --git a/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_SpielNaechsteRunde.java b/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_SpielNaechsteRunde.java
index 431577aaa..7b9104465 100644
--- a/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_SpielNaechsteRunde.java
+++ b/Klausuren/Sd1/Ws2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_SpielNaechsteRunde.java
@@ -13,7 +13,7 @@ import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
public class Test_SpielNaechsteRunde {
@Rule // Kill test if lasting longer than 1000 milliseconds
- public Timeout globalTimeout = new Timeout(1000);
+ public Timeout globalTimeout = Timeout.seconds(1);
@Test
public void nullBehandlung () {
diff --git a/Klausuren/Sd1/Ws2015/Solution/pom.xml b/Klausuren/Sd1/Ws2015/Solution/pom.xml
index 399d157c1..c7d9c13a8 100644
--- a/Klausuren/Sd1/Ws2015/Solution/pom.xml
+++ b/Klausuren/Sd1/Ws2015/Solution/pom.xml
@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm-stuttgart.sw1.klausur</groupId>
- <artifactId>sw1Solution</artifactId>
+ <artifactId>sw1_2015winter_solve</artifactId>
<version>0.9</version>
<packaging>jar</packaging>
- <name>sw1Solution</name>
- <url>http://maven.apache.org</url>
+ <name>sw1_2015winter_solve</name>
+ <url>https://freedocs.mi.hdm-stuttgart.de</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
--
GitLab