Merge branch 'master' into feature/issue1190-maui

dkpro · May 4, 2019 · 6507c15 · 6507c15
2 parents 741a18e + 7097287
commit 6507c15
Show file tree

Hide file tree

Showing 19 changed files with 140 additions and 144 deletions.
diff --git a/dkpro-core-api-datasets-asl/pom.xml b/dkpro-core-api-datasets-asl/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.github.junrar</groupId>
       <artifactId>junrar</artifactId>
-      <version>0.7</version>
+      <version>4.0.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.commons</groupId>

diff --git a/dkpro-core-api-resources-asl/pom.xml b/dkpro-core-api-resources-asl/pom.xml
@@ -96,8 +96,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java b/...-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java
@@ -18,9 +18,8 @@
 package org.dkpro.core.api.resources;
 
 import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -103,13 +102,13 @@ public void testGetUrlAsExecutable()
         URL url = new URL("jar:file:src/test/resources/testfiles.zip!/testfiles/"
                 + "FileSetCollectionReaderBase.class");
         File file = ResourceUtils.getUrlAsExecutable(url, false);
-        assertThat(file.getName().endsWith("temp"), is(true));
+
+        assertThat(file.getName()).endsWith("temp");
 
         URL url2 = new URL("jar:file:src/test/resources/testfiles.zip!/testfiles/"
                 + "ResourceCollectionReaderBase.class");
         file = ResourceUtils.getUrlAsExecutable(url2, true);
-        assertThat(file.getName().endsWith("temp"), is(true));
-
+
+        assertThat(file.getName()).endsWith("temp");
     }
-
 }
diff --git a/dkpro-core-api-segmentation-asl/pom.xml b/dkpro-core-api-segmentation-asl/pom.xml
@@ -56,8 +56,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...core-api-segmentation-asl/src/test/java/org/dkpro/core/api/segmentation/CompoundTest.java b/...core-api-segmentation-asl/src/test/java/org/dkpro/core/api/segmentation/CompoundTest.java
@@ -17,8 +17,11 @@
  */
 package org.dkpro.core.api.segmentation;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Compound.CompoundSplitLevel.ALL;
+import static de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Compound.CompoundSplitLevel.HIGHEST;
+import static de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Compound.CompoundSplitLevel.LOWEST;
+import static de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Compound.CompoundSplitLevel.NONE;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,13 +36,11 @@
 import org.junit.Test;
 
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Compound;
-import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Compound.CompoundSplitLevel;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.CompoundPart;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Split;
 
 public class CompoundTest
 {
-
     private Compound compound;
 
     @Before
@@ -66,62 +67,39 @@ public void setUpCompound() throws UIMAException
         compound.setSplits(FSCollectionFactory.createFSArray(jcas, splits));
         compound.addToIndexes();
         jcasBuilder.close();
-
     }
 
     @Test
     public void testAll() throws UIMAException
     {
-
-        final String[] splitsList = new String[] { "getränk", "automat", "auto", "mat" };
-        assertThat(coveredTextArrayFromAnnotations(
-                compound.getSplitsWithoutMorpheme(CompoundSplitLevel.ALL)), is(splitsList));
-
+        assertThat(compound.getSplitsWithoutMorpheme(ALL))
+                .extracting(Annotation::getCoveredText)
+                .containsExactly("getränk", "automat", "auto", "mat");
     }
 
     @Test
     public void testLowest() throws UIMAException
     {
-
-        final String[] splitsList = new String[] { "getränk", "auto", "mat" };
-        assertThat(
-                coveredTextArrayFromAnnotations(
-                        compound.getSplitsWithoutMorpheme(CompoundSplitLevel.LOWEST)),
-                is(splitsList));
+        assertThat(compound.getSplitsWithoutMorpheme(LOWEST))
+                .extracting(Annotation::getCoveredText)
+                .containsExactly("getränk", "auto", "mat");
 
     }
 
     @Test
     public void testHighest() throws UIMAException
     {
-
-        final String[] splitsList = new String[] { "getränk", "automat" };
-        assertThat(
-                coveredTextArrayFromAnnotations(
-                        compound.getSplitsWithoutMorpheme(CompoundSplitLevel.HIGHEST)),
-                is(splitsList));
+        assertThat(compound.getSplitsWithoutMorpheme(HIGHEST))
+                .extracting(Annotation::getCoveredText)
+                .containsExactly("getränk", "automat");
 
     }
 
     @Test
     public void testNone() throws UIMAException
     {
-
-        final String[] splitsList = new String[] {};
-        assertThat(
-                coveredTextArrayFromAnnotations(
-                        compound.getSplitsWithoutMorpheme(CompoundSplitLevel.NONE)),
-                is(splitsList));
-
-    }
-
-    public <T extends Annotation> String[] coveredTextArrayFromAnnotations(final T[] annotations)
-    {
-        final List<String> list = new ArrayList<String>();
-        for (T annotation : annotations) {
-            list.add(annotation.getCoveredText());
-        }
-        return list.toArray(new String[list.size()]);
+        assertThat(compound.getSplitsWithoutMorpheme(NONE))
+                .extracting(Annotation::getCoveredText)
+                .isEmpty();
     }
-
 }
diff --git a/dkpro-core-decompounding-asl/pom.xml b/dkpro-core-decompounding-asl/pom.xml
@@ -115,8 +115,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...nding-asl/src/test/java/org/dkpro/core/decompounding/dictionary/SimpleDictionaryTest.java b/...nding-asl/src/test/java/org/dkpro/core/decompounding/dictionary/SimpleDictionaryTest.java
@@ -18,16 +18,15 @@
 
 package org.dkpro.core.decompounding.dictionary;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.dkpro.core.api.resources.ResourceUtils;
 import org.dkpro.core.decompounding.dictionary.SimpleDictionary;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -47,18 +46,17 @@ public void setUp() throws IOException
     @Test
     public void testContains()
     {
-        Assert.assertEquals(72508, dict.getAll().size());
+        assertEquals(72508, dict.getAll().size());
 
-        Assert.assertTrue(dict.contains("worauf"));
-        Assert.assertTrue(dict.contains("woraufhin"));
-        Assert.assertTrue(dict.contains("woraus"));
+        assertTrue(dict.contains("worauf"));
+        assertTrue(dict.contains("woraufhin"));
+        assertTrue(dict.contains("woraus"));
     }
 
     @Test
     public void testDictionary()
     {
-        assertThat(dict.getAll().size(), not(0));
-        assertThat(dict.contains("zu"), is(true));
+        assertThat(dict.getAll()).isNotEmpty();
+        assertThat(dict.contains("zu")).isTrue();
     }
-
 }
diff --git a/...mpounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/BananaSplitterTest.java b/...mpounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/BananaSplitterTest.java
@@ -17,9 +17,8 @@
  **/
 package org.dkpro.core.decompounding.splitter;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,6 +40,7 @@ public void testSplitter() throws IOException
         splitter.setDictionary(new SimpleDictionary("Garage", "einfahrt"));
 
         List<DecompoundedWord> result = splitter.split("Garageneinfahrt").getAllSplits();
+
         assertEquals(2, result.size());
         assertEquals("Garageneinfahrt", result.get(0).toString());
         assertEquals("garage(n)+einfahrt", result.get(1).toString());
@@ -55,7 +55,9 @@ public void testSplitter2() throws IOException
         Dictionary dict = new SimpleDictionary(dictFile, "UTF-8");
         BananaSplitterAlgorithm splitter = new BananaSplitterAlgorithm();
         splitter.setDictionary(dict);
+
         List<DecompoundedWord> result = splitter.split("geräteelektronik").getAllSplits();
-        assertThat(result.size(), is(1));
+
+        assertThat(result).hasSize(1);
     }
 }
diff --git a/...ding-asl/src/test/java/org/dkpro/core/decompounding/splitter/DataDrivenAlgorithmTest.java b/...ding-asl/src/test/java/org/dkpro/core/decompounding/splitter/DataDrivenAlgorithmTest.java
@@ -18,9 +18,8 @@
 
 package org.dkpro.core.decompounding.splitter;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,8 +28,6 @@
 import org.dkpro.core.api.resources.ResourceUtils;
 import org.dkpro.core.decompounding.dictionary.LinkingMorphemes;
 import org.dkpro.core.decompounding.dictionary.SimpleDictionary;
-import org.dkpro.core.decompounding.splitter.DataDrivenSplitterAlgorithm;
-import org.dkpro.core.decompounding.splitter.DecompoundedWord;
 import org.junit.Test;
 
 public class DataDrivenAlgorithmTest
@@ -64,6 +61,7 @@ public void testSplit2() throws IOException
         LinkingMorphemes morphemes = new LinkingMorphemes(morphemesFile);
         DataDrivenSplitterAlgorithm splitter = new DataDrivenSplitterAlgorithm(dict, morphemes);
         List<DecompoundedWord> result = splitter.split("geräteelektronik").getAllSplits();
-        assertThat(result.size(), is(1));
+
+        assertThat(result).hasSize(1);
     }
 }
diff --git a/...ounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/DecompoundedWordTest.java b/...ounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/DecompoundedWordTest.java
@@ -18,10 +18,9 @@
 
 package org.dkpro.core.decompounding.splitter;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -145,16 +144,18 @@ public void testIsCompound()
     {
         DecompoundedWord s1 = DecompoundedWord.createFromString("Aktion(s)+plan");
         DecompoundedWord s2 = DecompoundedWord.createFromString("Aktionsplan");
-        assertThat(s1.isCompound(), is(true));
-        assertThat(s2.isCompound(), is(false));
+
+        assertThat(s1.isCompound()).isTrue();
+        assertThat(s2.isCompound()).isFalse();
     }
 
     @Test
     public void testHasLastFragmentMorpheme()
     {
         DecompoundedWord s1 = DecompoundedWord.createFromString("Aktion(s)+plan");
         DecompoundedWord s2 = DecompoundedWord.createFromString("unter+flur+konvektor(en)");
-        assertThat(s1.hasLastFragmentMorpheme(), is(false));
-        assertThat(s2.hasLastFragmentMorpheme(), is(true));
+
+        assertThat(s1.hasLastFragmentMorpheme()).isFalse();
+        assertThat(s2.hasLastFragmentMorpheme()).isTrue();
     }
 }
diff --git a/...e-decompounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/FragmentTest.java b/...e-decompounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/FragmentTest.java
@@ -18,8 +18,9 @@
 
 package org.dkpro.core.decompounding.splitter;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.dkpro.core.decompounding.splitter.Fragment;
-import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -72,6 +73,7 @@ public void testEquals()
     public void testCreateFromString()
     {
         Fragment fragm = Fragment.createFromString("(");
-        Assert.assertThat(fragm.getWord(), CoreMatchers.is("("));
+
+        assertThat(fragm.getWord()).isEqualTo("(");
     }
 }
diff --git a/...ompounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/JWordSplitterTest.java b/...ompounding-asl/src/test/java/org/dkpro/core/decompounding/splitter/JWordSplitterTest.java
@@ -17,9 +17,8 @@
  **/
 package org.dkpro.core.decompounding.splitter;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,6 +39,7 @@ public void testSplitter()
     {
         JWordSplitterAlgorithm splitter = new JWordSplitterAlgorithm();
         List<DecompoundedWord> result = splitter.split("Aktionsplan").getAllSplits();
+
         assertEquals(2, result.size());
         assertEquals("Aktionsplan", result.get(0).toString());
         assertEquals("Aktion(s)+plan", result.get(1).toString());
@@ -51,12 +51,12 @@ public void testSplliter2() throws IOException {
         final File dictFile = ResourceUtils.getUrlAsFile(getClass().getResource(
                 "/de/tudarmstadt/ukp/dkpro/core/decompounding/lib/spelling-de-igerman98.dic"),
                 false);
-        ;
 
         Dictionary dict = new SimpleDictionary(dictFile, "UTF-8");
         splitter.setDictionary(dict);
         List<DecompoundedWord> result = splitter.split("geräteelektronik").getAllSplits();
-        assertThat(result.size(),is(1));
+
+        assertThat(result).hasSize(1);
     }
 
     @Test
@@ -65,11 +65,11 @@ public void testSplliter3() throws IOException {
         final File dictFile = ResourceUtils.getUrlAsFile(getClass().getResource(
                 "/de/tudarmstadt/ukp/dkpro/core/decompounding/lib/spelling-de-igerman98.dic"),
                 false);
-        ;
 
         Dictionary dict = new SimpleDictionary(dictFile, "UTF-8");
         splitter.setDictionary(dict);
         List<DecompoundedWord> result = splitter.split("Schwerwiegend").getAllSplits();
-        assertThat(result.size(),is(1));
+
+        assertThat(result).hasSize(1);
     }
 }