Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,11 @@
<commitIdGenerationMode>full</commitIdGenerationMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
</plugins>
</build>

Expand Down
11 changes: 11 additions & 0 deletions src/test/java/org/tikv/BaseRawKVTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,21 @@

package org.tikv;

import org.tikv.common.PDClient;
import org.tikv.common.StoreVersion;
import org.tikv.common.TiConfiguration;
import org.tikv.common.TiSession;
import org.tikv.util.TestUtils;

public class BaseRawKVTest {

protected boolean tikvVersionNewerThan(String expectedVersion) {
TiConfiguration conf = createTiConfiguration();
TiSession session = TiSession.create(conf);
PDClient pdClient = session.getPDClient();
return StoreVersion.minTiKVVersion(expectedVersion, pdClient);
}

protected TiConfiguration createTiConfiguration() {
String pdAddrsStr = TestUtils.getEnv("RAWKV_PD_ADDRESSES");

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/org/tikv/common/PDClientIntegrationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
import static org.junit.Assert.assertTrue;

import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.tikv.BaseRawKVTest;

public class PDClientIntegrationTest extends BaseRawKVTest {

private TiSession session;

@Before
Expand All @@ -44,6 +46,7 @@ public void tearDown() throws Exception {

@Test
public void testPauseCheck() throws Exception {
Assume.assumeTrue(tikvVersionNewerThan("v5.3.0"));
try (PDClient client = session.getPDClient()) {
PDChecker checker = PDChecker.Merge;
for (int i = 0; i < 2; i++) {
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/org/tikv/common/importer/RawKVIngestTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Optional;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.tikv.BaseRawKVTest;
Expand All @@ -37,6 +38,7 @@
import org.tikv.util.TestUtils;

public class RawKVIngestTest extends BaseRawKVTest {

private TiSession session;

private static final int KEY_NUMBER = 16;
Expand All @@ -59,6 +61,7 @@ public void tearDown() throws Exception {

@Test
public void rawKVIngestTest() {
Assume.assumeTrue(tikvVersionNewerThan("v5.2.0"));
RawKVClient client = session.createRawClient();

// gen test data
Expand Down Expand Up @@ -88,6 +91,7 @@ public void rawKVIngestTest() {

@Test
public void rawKVIngestTestWithTTL() throws InterruptedException {
Assume.assumeTrue(tikvVersionNewerThan("v5.2.0"));
long ttl = 10;
RawKVClient client = session.createRawClient();

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/org/tikv/common/importer/RegionSplitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.tikv.BaseRawKVTest;
Expand All @@ -32,6 +33,7 @@
import org.tikv.common.region.TiRegion;

public class RegionSplitTest extends BaseRawKVTest {

private TiSession session;

private static final int KEY_NUMBER = 10;
Expand All @@ -53,6 +55,7 @@ public void tearDown() throws Exception {

@Test
public void rawKVSplitTest() {
Assume.assumeTrue(tikvVersionNewerThan("v5.1.0"));
List<byte[]> splitKeys = new ArrayList<>(KEY_NUMBER);
for (int i = 0; i < KEY_NUMBER; i++) {
splitKeys.add(genRandomKey(KEY_PREFIX, KEY_LENGTH));
Expand Down