Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Y
YCSB
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Adnan Ahmad
YCSB
Commits
98712967
Unverified
Commit
98712967
authored
8 years ago
by
Jason Tedor
Browse files
Options
Downloads
Patches
Plain Diff
[elasticsearch] switch test runner to JUnit
This commit switches the Elasticsearch test runner from TestNG to JUnit.
parent
4f299b80
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
elasticsearch/pom.xml
+3
-3
3 additions, 3 deletions
elasticsearch/pom.xml
elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
+9
-10
9 additions, 10 deletions
.../test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
with
12 additions
and
13 deletions
elasticsearch/pom.xml
+
3
−
3
View file @
98712967
...
@@ -51,9 +51,9 @@ LICENSE file.
...
@@ -51,9 +51,9 @@ LICENSE file.
<version>
${elasticsearch-version}
</version>
<version>
${elasticsearch-version}
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.testng
</groupId>
<groupId>
junit
</groupId>
<artifactId>
testng
</artifactId>
<artifactId>
junit
</artifactId>
<version>
6
.1
.1
</version>
<version>
4
.1
2
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
</dependencies>
</dependencies>
...
...
This diff is collapsed.
Click to expand it.
elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
+
9
−
10
View file @
98712967
...
@@ -21,23 +21,22 @@
...
@@ -21,23 +21,22 @@
*/
*/
package
com.yahoo.ycsb.db
;
package
com.yahoo.ycsb.db
;
import
static
org
.
testng
.
AssertJUnit
.
assertEquals
;
import
com.yahoo.ycsb.ByteIterator
;
import
com.yahoo.ycsb.ByteIterator
;
import
com.yahoo.ycsb.DBException
;
import
com.yahoo.ycsb.DBException
;
import
com.yahoo.ycsb.Status
;
import
com.yahoo.ycsb.Status
;
import
com.yahoo.ycsb.StringByteIterator
;
import
com.yahoo.ycsb.StringByteIterator
;
import
org.junit.After
;
import
org.testng.annotations.AfterClass
;
import
org.junit.AfterClass
;
import
org.testng.annotations.AfterMethod
;
import
org.junit.Before
;
import
org.testng.annotations.BeforeClass
;
import
org.junit.BeforeClass
;
import
org.testng.annotations.BeforeMethod
;
import
org.junit.Test
;
import
org.testng.annotations.Test
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.Vector
;
import
java.util.Vector
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
public
class
ElasticsearchClientTest
{
public
class
ElasticsearchClientTest
{
protected
final
static
ElasticsearchClient
instance
=
new
ElasticsearchClient
();
protected
final
static
ElasticsearchClient
instance
=
new
ElasticsearchClient
();
...
@@ -64,13 +63,13 @@ public class ElasticsearchClientTest {
...
@@ -64,13 +63,13 @@ public class ElasticsearchClientTest {
instance
.
cleanup
();
instance
.
cleanup
();
}
}
@Before
Method
@Before
public
void
setUp
()
{
public
void
setUp
()
{
instance
.
insert
(
MOCK_TABLE
,
MOCK_KEY1
,
MOCK_DATA
);
instance
.
insert
(
MOCK_TABLE
,
MOCK_KEY1
,
MOCK_DATA
);
instance
.
insert
(
MOCK_TABLE
,
MOCK_KEY2
,
MOCK_DATA
);
instance
.
insert
(
MOCK_TABLE
,
MOCK_KEY2
,
MOCK_DATA
);
}
}
@After
Method
@After
public
void
tearDown
()
{
public
void
tearDown
()
{
instance
.
delete
(
MOCK_TABLE
,
MOCK_KEY1
);
instance
.
delete
(
MOCK_TABLE
,
MOCK_KEY1
);
instance
.
delete
(
MOCK_TABLE
,
MOCK_KEY2
);
instance
.
delete
(
MOCK_TABLE
,
MOCK_KEY2
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment