merge conflict resolution
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java b/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java
index bb4f950..0deb98b 100644
--- a/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/service/SearchKrillTest.java
@@ -8,10 +8,12 @@
import de.ids_mannheim.korap.query.serialize.QuerySerializer;
import de.ids_mannheim.korap.utils.JsonUtils;
import de.ids_mannheim.korap.web.SearchKrill;
+
import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
@@ -20,6 +22,10 @@
*/
public class SearchKrillTest extends BeanConfigTest {
+ @Override
+ public void initMethod () throws KustvaktException {
+
+ }
@Test
public void testInit () {
@@ -55,7 +61,6 @@
QuerySerializer s = new QuerySerializer();
s.setQuery("[orth=der]", "poliqarp");
-
KustvaktConfiguration config = helper().getContext().getConfiguration();
SearchKrill krill = new SearchKrill(config.getIndexDir());
String result = krill.search(s.toJSON());
@@ -63,15 +68,6 @@
JsonNode node = JsonUtils.readTree(result);
assertNotNull(node);
assertNotEquals(0, node.at("/matches").size());
-
-
-
}
-
-
- @Override
- public void initMethod () throws KustvaktException {
-
- }
}