Skip to content

Commit 4519c9f

Browse files
adutraadutra
committed
Switch tests to parallel tests
1 parent cc037c7 commit 4519c9f

5 files changed

Lines changed: 17 additions & 4 deletions

File tree

‎integration-tests/src/test/java/com/datastax/oss/driver/core/SerializationIT.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,17 @@
2929
import com.datastax.oss.driver.api.core.type.DataTypes;
3030
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
3131
import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
32+
import com.datastax.oss.driver.categories.ParallelizableTests;
3233
import com.datastax.oss.driver.internal.SerializationHelper;
3334
import com.datastax.oss.simulacron.common.cluster.ClusterSpec;
3435
import org.junit.Before;
3536
import org.junit.ClassRule;
3637
import org.junit.Test;
38+
import org.junit.experimental.categories.Category;
3739
import org.junit.rules.RuleChain;
3840
import org.junit.rules.TestRule;
3941

42+
@Category(ParallelizableTests.class)
4043
public class SerializationIT {
4144
private static final SimulacronRule SIMULACRON_RULE =
4245
new SimulacronRule(ClusterSpec.builder().withNodes(1));

‎integration-tests/src/test/java/com/datastax/oss/driver/core/retry/ConsistencyDowngradingRetryPolicyIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
6161
import com.datastax.oss.driver.api.testinfra.simulacron.QueryCounter;
6262
import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
63+
import com.datastax.oss.driver.categories.ParallelizableTests;
6364
import com.datastax.oss.driver.internal.core.retry.ConsistencyDowngradingRetryPolicy;
6465
import com.datastax.oss.driver.internal.core.retry.ConsistencyDowngradingRetryVerdict;
6566
import com.datastax.oss.simulacron.common.cluster.ClusterSpec;
@@ -83,12 +84,14 @@
8384
import org.junit.ClassRule;
8485
import org.junit.Rule;
8586
import org.junit.Test;
87+
import org.junit.experimental.categories.Category;
8688
import org.junit.runner.RunWith;
8789
import org.mockito.ArgumentCaptor;
8890
import org.slf4j.LoggerFactory;
8991
import org.slf4j.helpers.MessageFormatter;
9092

9193
@RunWith(DataProviderRunner.class)
94+
@Category(ParallelizableTests.class)
9295
public class ConsistencyDowngradingRetryPolicyIT {
9396

9497
@ClassRule
@@ -130,7 +133,6 @@ public class ConsistencyDowngradingRetryPolicyIT {
130133
.setConsistencyLevel(DefaultConsistencyLevel.LOCAL_SERIAL)
131134
.build();
132135

133-
@SuppressWarnings("deprecation")
134136
private final QueryCounter localQuorumCounter =
135137
QueryCounter.builder(SIMULACRON_RULE.cluster())
136138
.withFilter(
@@ -139,15 +141,13 @@ public class ConsistencyDowngradingRetryPolicyIT {
139141
&& l.getConsistency().equals(ConsistencyLevel.LOCAL_QUORUM))
140142
.build();
141143

142-
@SuppressWarnings("deprecation")
143144
private final QueryCounter oneCounter =
144145
QueryCounter.builder(SIMULACRON_RULE.cluster())
145146
.withFilter(
146147
(l) ->
147148
l.getQuery().equals(QUERY_STR) && l.getConsistency().equals(ConsistencyLevel.ONE))
148149
.build();
149150

150-
@SuppressWarnings("deprecation")
151151
private final QueryCounter localSerialCounter =
152152
QueryCounter.builder(SIMULACRON_RULE.cluster())
153153
.withFilter(

‎integration-tests/src/test/java/com/datastax/oss/driver/core/throttling/ThrottlingIT.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@
2424
import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
2525
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
2626
import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
27+
import com.datastax.oss.driver.categories.ParallelizableTests;
2728
import com.datastax.oss.driver.internal.core.session.throttling.ConcurrencyLimitingRequestThrottler;
2829
import com.datastax.oss.simulacron.common.cluster.ClusterSpec;
2930
import com.datastax.oss.simulacron.common.stubbing.PrimeDsl;
3031
import java.util.concurrent.TimeUnit;
3132
import org.junit.Rule;
3233
import org.junit.Test;
34+
import org.junit.experimental.categories.Category;
3335

36+
@Category(ParallelizableTests.class)
3437
public class ThrottlingIT {
3538

3639
private static final String QUERY = "select * from foo";

‎integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestLoggerIT.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
4141
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
4242
import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
43+
import com.datastax.oss.driver.categories.ParallelizableTests;
4344
import com.datastax.oss.driver.internal.core.tracker.RequestLogger;
4445
import com.datastax.oss.simulacron.common.cluster.ClusterSpec;
4546
import com.datastax.oss.simulacron.common.codec.ConsistencyLevel;
@@ -52,6 +53,7 @@
5253
import org.junit.Before;
5354
import org.junit.Rule;
5455
import org.junit.Test;
56+
import org.junit.experimental.categories.Category;
5557
import org.junit.rules.RuleChain;
5658
import org.junit.rules.TestRule;
5759
import org.junit.runner.RunWith;
@@ -64,6 +66,7 @@
6466
import org.slf4j.LoggerFactory;
6567

6668
@RunWith(MockitoJUnitRunner.class)
69+
@Category(ParallelizableTests.class)
6770
public class RequestLoggerIT {
6871
private static final Pattern LOG_PREFIX_PER_REQUEST = Pattern.compile("\\[s\\d*\\|\\d*]");
6972

@@ -80,7 +83,8 @@ public class RequestLoggerIT {
8083

8184
private static final String QUERY = "SELECT release_version FROM system.local";
8285

83-
private SimulacronRule simulacronRule = new SimulacronRule(ClusterSpec.builder().withNodes(3));
86+
private final SimulacronRule simulacronRule =
87+
new SimulacronRule(ClusterSpec.builder().withNodes(3));
8488

8589
private final DriverConfigLoader requestLoader =
8690
SessionUtils.configLoaderBuilder()

‎integration-tests/src/test/java/com/datastax/oss/driver/mapper/StatementAttributesIT.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.datastax.oss.driver.api.mapper.annotations.Update;
3939
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
4040
import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule;
41+
import com.datastax.oss.driver.categories.ParallelizableTests;
4142
import com.datastax.oss.protocol.internal.Message;
4243
import com.datastax.oss.protocol.internal.request.Execute;
4344
import com.datastax.oss.simulacron.common.cluster.ClusterQueryLogReport;
@@ -56,9 +57,11 @@
5657
import org.junit.BeforeClass;
5758
import org.junit.ClassRule;
5859
import org.junit.Test;
60+
import org.junit.experimental.categories.Category;
5961
import org.junit.rules.RuleChain;
6062
import org.junit.rules.TestRule;
6163

64+
@Category(ParallelizableTests.class)
6265
public class StatementAttributesIT {
6366

6467
private static final SimulacronRule SIMULACRON_RULE =

0 commit comments

Comments
 (0)