Skip to content

Commit c19d5e6

Browse files
committed
Move tests to JUnit
Closes #13.
1 parent 14cbe08 commit c19d5e6

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

pom.xml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
<properties>
3434
<elasticsearch.version>0.90.8</elasticsearch.version>
3535
<lucene.version>4.6.0</lucene.version>
36+
<tests.jvms>1</tests.jvms>
37+
<tests.shuffle>true</tests.shuffle>
38+
<tests.output>onerror</tests.output>
39+
<tests.client.ratio></tests.client.ratio>
40+
<es.logger.level>INFO</es.logger.level>
3641
</properties>
3742

3843
<repositories>
@@ -43,6 +48,19 @@
4348
</repositories>
4449

4550
<dependencies>
51+
<dependency>
52+
<groupId>org.hamcrest</groupId>
53+
<artifactId>hamcrest-all</artifactId>
54+
<version>1.3</version>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.apache.lucene</groupId>
59+
<artifactId>lucene-test-framework</artifactId>
60+
<version>${lucene.version}</version>
61+
<scope>test</scope>
62+
</dependency>
63+
4664
<dependency>
4765
<groupId>org.elasticsearch</groupId>
4866
<artifactId>elasticsearch</artifactId>
@@ -65,26 +83,10 @@
6583
</dependency>
6684

6785
<dependency>
68-
<groupId>org.testng</groupId>
69-
<artifactId>testng</artifactId>
70-
<version>6.8</version>
71-
<scope>test</scope>
72-
<exclusions>
73-
<exclusion>
74-
<groupId>org.hamcrest</groupId>
75-
<artifactId>hamcrest-core</artifactId>
76-
</exclusion>
77-
<exclusion>
78-
<groupId>junit</groupId>
79-
<artifactId>junit</artifactId>
80-
</exclusion>
81-
</exclusions>
82-
</dependency>
83-
84-
<dependency>
85-
<groupId>org.hamcrest</groupId>
86-
<artifactId>hamcrest-all</artifactId>
87-
<version>1.3</version>
86+
<groupId>org.elasticsearch</groupId>
87+
<artifactId>elasticsearch</artifactId>
88+
<version>${elasticsearch.version}</version>
89+
<type>test-jar</type>
8890
<scope>test</scope>
8991
</dependency>
9092

src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,14 @@
2929
import org.elasticsearch.index.settings.IndexSettingsModule;
3030
import org.elasticsearch.indices.analysis.IndicesAnalysisModule;
3131
import org.elasticsearch.indices.analysis.IndicesAnalysisService;
32-
import org.testng.annotations.Test;
32+
import org.elasticsearch.test.ElasticsearchTestCase;
33+
import org.junit.Test;
3334

3435
import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS;
35-
import static org.hamcrest.MatcherAssert.assertThat;
3636
import static org.hamcrest.Matchers.instanceOf;
37-
3837
/**
3938
*/
40-
public class SimpleIcuAnalysisTests {
39+
public class SimpleIcuAnalysisTests extends ElasticsearchTestCase {
4140

4241
@Test
4342
public void testDefaultsIcuAnalysis() {

src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
import org.elasticsearch.index.settings.IndexSettingsModule;
1919
import org.elasticsearch.indices.analysis.IndicesAnalysisModule;
2020
import org.elasticsearch.indices.analysis.IndicesAnalysisService;
21-
import org.testng.annotations.Test;
21+
import org.elasticsearch.test.ElasticsearchTestCase;
22+
import org.junit.Test;
2223

2324
import java.io.IOException;
2425
import java.io.StringReader;
2526

26-
import static org.hamcrest.MatcherAssert.assertThat;
2727
import static org.hamcrest.Matchers.equalTo;
2828

2929
// Tests borrowed from Solr's Icu collation key filter factory test.
30-
public class SimpleIcuCollationTokenFilterTests {
30+
public class SimpleIcuCollationTokenFilterTests extends ElasticsearchTestCase {
3131

3232
/*
3333
* Turkish has some funny casing.

0 commit comments

Comments
 (0)