Migrated to newer JUnit version and restructured tests

Author: DaBr01

pom.xml

@@ -42,9 +42,15 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
@@ -100,6 +106,18 @@
                     <target>7</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>5.9.2</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/test/QuestionTest.java renamed to src/test/java/simplenlgde/QuestionTest.java

@@ -1,4 +1,4 @@
-/*
+package simplenlgde;/*
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -14,14 +14,13 @@
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;
 import simplenlgde.features.*;
 import simplenlgde.phrasespec.*;
 
-import org.junit.jupiter.api.Assertions;
-
 public class QuestionTest {
     private static Lexicon lexicon;
     private static NLGFactory nlgFactory;

src/test/RealiserTest.java renamed to src/test/java/simplenlgde/RealiserTest.java

@@ -1,13 +1,14 @@
+package simplenlgde;
+
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;
 import simplenlgde.features.*;
 import simplenlgde.phrasespec.*;
 
-import org.junit.jupiter.api.Assertions;
-
 public class RealiserTest {
 
     private static Lexicon lexicon;

src/test/SaToSTest.java renamed to src/test/java/simplenlgde/SaToSTest.java

@@ -1,4 +1,4 @@
-/*
+package simplenlgde;/*
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -14,13 +14,12 @@
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;
 import simplenlgde.phrasespec.*;
 
-import org.junit.jupiter.api.Assertions;
-
 public class SaToSTest {
     private static Lexicon lexicon;
     private static NLGFactory nlgFactory;

src/test/SyntaxTreeTest.java renamed to src/test/java/simplenlgde/SyntaxTreeTest.java

@@ -1,3 +1,5 @@
+package simplenlgde;
+
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import simplenlgde.framework.*;

src/test/MorphologyTest/AdjectiveInflectionTest.java renamed to src/test/java/simplenlgde/morphology/AdjectiveInflectionTest.java

@@ -1,15 +1,14 @@
-package MorphologyTest;
+package simplenlgde.morphology;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;
 import simplenlgde.features.*;
 import simplenlgde.phrasespec.*;
 
-import org.junit.jupiter.api.Assertions;
-
 public class AdjectiveInflectionTest {
 
     private static Lexicon lexicon;

src/test/MorphologyTest/BasewordTest.java renamed to src/test/java/simplenlgde/morphology/BasewordTest.java

@@ -12,17 +12,16 @@
  * Contributor(s): Daniel Braun, Technical University of Munich.
  */
 
-package MorphologyTest;
+package simplenlgde.morphology;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;
 import simplenlgde.phrasespec.*;
 
-import org.junit.jupiter.api.Assertions;
-
 public class BasewordTest {
     private static Lexicon lexicon;
     private static NLGFactory nlgFactory;

src/test/MorphologyTest/NounInflectionTest.java renamed to src/test/java/simplenlgde/morphology/NounInflectionTest.java

@@ -1,15 +1,14 @@
-package MorphologyTest;
+package simplenlgde.morphology;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;
 import simplenlgde.features.*;
 import simplenlgde.phrasespec.*;
 
-import org.junit.jupiter.api.Assertions;
-
 public class NounInflectionTest {
 
     private static Lexicon lexicon;

src/test/MorphologyTest/VerbInflectionTest.java renamed to src/test/java/simplenlgde/morphology/VerbInflectionTest.java

@@ -1,4 +1,4 @@
-package MorphologyTest;
+package simplenlgde.morphology;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

src/test/SyntaxTest/MainClausesTest.java renamed to src/test/java/simplenlgde/syntax/MainClausesTest.java

@@ -1,8 +1,8 @@
-package SyntaxTest;
-import org.junit.jupiter.api.Assertions;
+package simplenlgde.syntax;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import simplenlgde.framework.*;
 import simplenlgde.lexicon.Lexicon;
 import simplenlgde.realiser.Realiser;

src/test/SyntaxTest/SubordinateClausesTest.java renamed to src/test/java/simplenlgde/syntax/SubordinateClausesTest.java

@@ -1,7 +1,6 @@
-package SyntaxTest;
+package simplenlgde.syntax;
 
 import org.junit.jupiter.api.Assertions;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import simplenlgde.framework.*;