Skip to content

Commit e2c2a50

Browse files
dadoonetdadoonet
committed
Move tests to JUnit
Closes #7.
1 parent 4eb0f0a commit e2c2a50

File tree

3 files changed

+108
-27
lines changed

3 files changed

+108
-27
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
/.project
99
/.settings
1010
/.classpath
11+
/.local-execution-hints.log

‎pom.xml

Lines changed: 104 additions & 25 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,23 +83,10 @@
6583
</dependency>
6684

6785
<dependency>
68-
<groupId>org.testng</groupId>
69-
<artifactId>testng</artifactId>
70-
<version>6.3.1</version>
71-
<scope>test</scope>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>org.hamcrest</groupId>
76-
<artifactId>hamcrest-core</artifactId>
77-
<version>1.3.RC2</version>
78-
<scope>test</scope>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>org.hamcrest</groupId>
83-
<artifactId>hamcrest-library</artifactId>
84-
<version>1.3.RC2</version>
86+
<groupId>org.elasticsearch</groupId>
87+
<artifactId>elasticsearch</artifactId>
88+
<version>${elasticsearch.version}</version>
89+
<type>test-jar</type>
8590
<scope>test</scope>
8691
</dependency>
8792
</dependencies>
@@ -98,15 +103,89 @@
98103
</configuration>
99104
</plugin>
100105
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-surefire-plugin</artifactId>
103-
<version>2.11</version>
104-
<configuration>
105-
<includes>
106-
<include>**/*Tests.java</include>
107-
</includes>
108-
</configuration>
106+
<groupId>com.carrotsearch.randomizedtesting</groupId>
107+
<artifactId>junit4-maven-plugin</artifactId>
108+
<version>2.0.12</version>
109+
<executions>
110+
<execution>
111+
<id>tests</id>
112+
<phase>test</phase>
113+
<goals>
114+
<goal>junit4</goal>
115+
</goals>
116+
<configuration>
117+
<heartbeat>20</heartbeat>
118+
<jvmOutputAction>pipe,warn</jvmOutputAction>
119+
<leaveTemporary>true</leaveTemporary>
120+
<listeners>
121+
<report-ant-xml mavenExtensions="true"
122+
dir="${project.build.directory}/surefire-reports"/>
123+
<report-text
124+
showThrowable="true"
125+
showStackTraces="true"
126+
showOutput="${tests.output}"
127+
showStatusOk="false"
128+
showStatusError="true"
129+
showStatusFailure="true"
130+
showStatusIgnored="true"
131+
showSuiteSummary="true"
132+
timestamps="false"/>
133+
<report-execution-times file="${basedir}/.local-execution-hints.log"/>
134+
</listeners>
135+
<assertions>
136+
<enable/>
137+
</assertions>
138+
<parallelism>${tests.jvms}</parallelism>
139+
<balancers>
140+
<execution-times>
141+
<fileset dir="${basedir}" includes=".local-execution-hints.log"/>
142+
</execution-times>
143+
</balancers>
144+
<includes>
145+
<include>**/*Tests.class</include>
146+
<include>**/*Test.class</include>
147+
</includes>
148+
<excludes>
149+
<exclude>**/Abstract*.class</exclude>
150+
<exclude>**/*StressTest.class</exclude>
151+
</excludes>
152+
<jvmArgs>
153+
<param>-Xmx512m</param>
154+
<param>-XX:MaxDirectMemorySize=512m</param>
155+
<param>-Des.logger.prefix=</param>
156+
</jvmArgs>
157+
<shuffleOnSlave>${tests.shuffle}</shuffleOnSlave>
158+
<sysouts>${tests.verbose}</sysouts>
159+
<seed>${tests.seed}</seed>
160+
<haltOnFailure>${tests.failfast}</haltOnFailure>
161+
<systemProperties>
162+
<!-- RandomizedTesting library system properties -->
163+
<tests.iters>${tests.iters}</tests.iters>
164+
<tests.maxfailures>${tests.maxfailures}</tests.maxfailures>
165+
<tests.failfast>${tests.failfast}</tests.failfast>
166+
<tests.class>${tests.class}</tests.class>
167+
<tests.method>${tests.method}</tests.method>
168+
<tests.nightly>${tests.nightly}</tests.nightly>
169+
<tests.badapples>${tests.badapples}</tests.badapples>
170+
<tests.weekly>${tests.weekly}</tests.weekly>
171+
<tests.slow>${tests.slow}</tests.slow>
172+
<tests.awaitsfix>${tests.awaitsfix}</tests.awaitsfix>
173+
<tests.slow>${tests.slow}</tests.slow>
174+
<tests.timeoutSuite>${tests.timeoutSuite}</tests.timeoutSuite>
175+
<tests.showSuccess>${tests.showSuccess}</tests.showSuccess>
176+
<tests.integration>${tests.integration}</tests.integration>
177+
<tests.cluster_seed>${tests.cluster_seed}</tests.cluster_seed>
178+
<tests.client.ratio>${tests.client.ratio}</tests.client.ratio>
179+
<es.node.local>${env.ES_TEST_LOCAL}</es.node.local>
180+
<es.node.mode>${es.node.mode}</es.node.mode>
181+
<es.logger.level>${es.logger.level}</es.logger.level>
182+
<java.awt.headless>true</java.awt.headless>
183+
</systemProperties>
184+
</configuration>
185+
</execution>
186+
</executions>
109187
</plugin>
188+
110189
<plugin>
111190
<groupId>org.apache.maven.plugins</groupId>
112191
<artifactId>maven-source-plugin</artifactId>

‎src/test/java/org/elasticsearch/index/analysis/SimpleSmartChineseAnalysisTests.java

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

3536
import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS;
3637
import static org.hamcrest.Matchers.instanceOf;
3738

3839
/**
3940
*/
40-
public class SimpleSmartChineseAnalysisTests {
41+
public class SimpleSmartChineseAnalysisTests extends ElasticsearchTestCase {
4142

4243
@Test
4344
public void testDefaultsIcuAnalysis() {

0 commit comments

Comments
 (0)