diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index fc028291bbec9b1e0146d99b973cc25d4d268821..334c580d80f51583ceed305601f9e6fb671b5b14 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -51,9 +51,9 @@ LICENSE file. <version>${elasticsearch-version}</version> </dependency> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.1.1</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> </dependencies> diff --git a/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java b/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java index 69e52ff678f2c29a39fd1e433293f893db2a3e58..3912c221ed96e816450a48b397a4a1350c72e57e 100644 --- a/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java +++ b/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java @@ -21,23 +21,22 @@ */ package com.yahoo.ycsb.db; -import static org.testng.AssertJUnit.assertEquals; - import com.yahoo.ycsb.ByteIterator; import com.yahoo.ycsb.DBException; import com.yahoo.ycsb.Status; import com.yahoo.ycsb.StringByteIterator; - -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.HashMap; import java.util.Set; import java.util.Vector; +import static org.junit.Assert.assertEquals; + public class ElasticsearchClientTest { protected final static ElasticsearchClient instance = new ElasticsearchClient(); @@ -64,13 +63,13 @@ public class ElasticsearchClientTest { instance.cleanup(); } - @BeforeMethod + @Before public void setUp() { instance.insert(MOCK_TABLE, MOCK_KEY1, MOCK_DATA); instance.insert(MOCK_TABLE, MOCK_KEY2, MOCK_DATA); } - @AfterMethod + @After public void tearDown() { instance.delete(MOCK_TABLE, MOCK_KEY1); instance.delete(MOCK_TABLE, MOCK_KEY2);