Skip to content

Commit 71dfd20

Browse files
tommystendahltommystendahl
authored
Bump dependencies (#1244)
1 parent b3ebb30 commit 71dfd20

File tree

3 files changed

+15
-29
lines changed

3 files changed

+15
-29
lines changed

‎core.impl/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/impl/repair/vnode/TestNormalizedRange.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import com.google.common.collect.ImmutableSet;
2121
import nl.jqno.equalsverifier.EqualsVerifier;
2222
import org.junit.Test;
23-
import org.junit.runner.RunWith;
24-
import org.mockito.Mock;
25-
import org.mockito.junit.MockitoJUnitRunner;
2623

2724
import java.math.BigInteger;
2825

@@ -31,14 +28,10 @@
3128
import static org.assertj.core.api.Assertions.assertThat;
3229
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3330

34-
@RunWith(MockitoJUnitRunner.class)
3531
public class TestNormalizedRange
3632
{
3733
private static final BigInteger START = BigInteger.ZERO;
3834

39-
@Mock
40-
DriverNode mockNode;
41-
4235
@Test
4336
public void testMutateStart()
4437
{
@@ -352,6 +345,6 @@ private BigInteger bi(long token)
352345

353346
private VnodeRepairState withVnode(long start, long end, long startedAt, long finishedAt)
354347
{
355-
return new VnodeRepairState(new LongTokenRange(start, end), ImmutableSet.of(mockNode), startedAt, finishedAt);
348+
return new VnodeRepairState(new LongTokenRange(start, end), ImmutableSet.of(), startedAt, finishedAt);
356349
}
357350
}

‎core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/state/TestRepairEntry.java‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,20 @@
1919
import com.google.common.collect.Sets;
2020
import nl.jqno.equalsverifier.EqualsVerifier;
2121
import org.junit.Test;
22-
import org.junit.runner.RunWith;
23-
import org.mockito.Mock;
24-
import org.mockito.junit.MockitoJUnitRunner;
2522

2623
import java.util.Set;
2724

2825
import static org.assertj.core.api.Assertions.assertThat;
2926

30-
@RunWith(MockitoJUnitRunner.class)
3127
public class TestRepairEntry
3228
{
33-
@Mock
34-
private DriverNode mockNode;
35-
3629
@Test
3730
public void testGetters()
3831
{
3932
LongTokenRange expectedLongTokenRange = new LongTokenRange(0, 1);
4033
long expectedStartedAt = 5;
4134
long expectedFinishedAt = expectedStartedAt + 5;
42-
Set<DriverNode> expectedParticipants = Sets.newHashSet(mockNode);
35+
Set<DriverNode> expectedParticipants = Sets.newHashSet();
4336
RepairStatus expectedStatus = RepairStatus.SUCCESS;
4437

4538
RepairEntry repairEntry = new RepairEntry(expectedLongTokenRange, expectedStartedAt, expectedFinishedAt, expectedParticipants, expectedStatus.toString());
@@ -54,8 +47,8 @@ public void testGetters()
5447
@Test
5548
public void testRepairEntriesAreEqual()
5649
{
57-
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(mockNode), "SUCCESS");
58-
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(mockNode), "SUCCESS");
50+
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(), "SUCCESS");
51+
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(), "SUCCESS");
5952

6053
assertThat(repairEntry).isEqualTo(repairEntry2);
6154
assertThat(repairEntry.hashCode()).isEqualTo(repairEntry2.hashCode());
@@ -64,34 +57,34 @@ public void testRepairEntriesAreEqual()
6457
@Test
6558
public void testRepairEntriesWithDifferentRangeAreNotEqual()
6659
{
67-
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(mockNode), "SUCCESS");
68-
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(1, 2), 5, 5, Sets.newHashSet(mockNode), "SUCCESS");
60+
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(), "SUCCESS");
61+
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(1, 2), 5, 5, Sets.newHashSet(), "SUCCESS");
6962

7063
assertThat(repairEntry).isNotEqualTo(repairEntry2);
7164
}
7265

7366
@Test
7467
public void testRepairEntriesWithDifferentStartedAtAreNotEqual()
7568
{
76-
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 7, Sets.newHashSet(mockNode), "SUCCESS");
77-
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 6, 7, Sets.newHashSet(mockNode), "SUCCESS");
69+
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 7, Sets.newHashSet(), "SUCCESS");
70+
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 6, 7, Sets.newHashSet(), "SUCCESS");
7871

7972
assertThat(repairEntry).isNotEqualTo(repairEntry2);
8073
}
8174

8275
@Test
8376
public void testRepairEntriesWithDifferentFinishedAtAreNotEqual()
8477
{
85-
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 6, Sets.newHashSet(mockNode), "SUCCESS");
86-
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 7, Sets.newHashSet(mockNode), "SUCCESS");
78+
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 6, Sets.newHashSet(), "SUCCESS");
79+
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 7, Sets.newHashSet(), "SUCCESS");
8780

8881
assertThat(repairEntry).isNotEqualTo(repairEntry2);
8982
}
9083

9184
@Test
9285
public void testRepairEntriesWithDifferentParticipantsAreNotEqual()
9386
{
94-
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(mockNode), "SUCCESS");
87+
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(new DriverNode(null)), "SUCCESS");
9588
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(), "SUCCESS");
9689

9790
assertThat(repairEntry).isNotEqualTo(repairEntry2);
@@ -100,8 +93,8 @@ public void testRepairEntriesWithDifferentParticipantsAreNotEqual()
10093
@Test
10194
public void testRepairEntriesWithDifferentStatusAreNotEqual()
10295
{
103-
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(mockNode), "SUCCESS");
104-
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(mockNode), "FAILED");
96+
RepairEntry repairEntry = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(), "SUCCESS");
97+
RepairEntry repairEntry2 = new RepairEntry(new LongTokenRange(0, 1), 5, 5, Sets.newHashSet(), "FAILED");
10598

10699
assertThat(repairEntry).isNotEqualTo(repairEntry2);
107100
}

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<junit.jupiter.junit-jupiter.version>6.0.1</junit.jupiter.junit-jupiter.version>
153153
<org.apache.commons.io.version>2.21.0</org.apache.commons.io.version>
154154
<org.apache.commons.commons-compress.version>1.28.0</org.apache.commons.commons-compress.version>
155-
<equalsverifier.version>4.2.2</equalsverifier.version>
155+
<equalsverifier.version>4.2.3</equalsverifier.version>
156156
<jcip.version>1.0</jcip.version>
157157
<testcontainers.version>1.21.3</testcontainers.version>
158158
<org.bouncycastle.bcpkix-jdk18on.version>1.82</org.bouncycastle.bcpkix-jdk18on.version>
@@ -169,7 +169,7 @@
169169
<org.apache.maven.plugins.maven-failsafe-plugin.version>3.5.4</org.apache.maven.plugins.maven-failsafe-plugin.version>
170170
<org.apache.maven.plugins.maven-gpg-plugin.version>3.2.8</org.apache.maven.plugins.maven-gpg-plugin.version>
171171
<org.apache.maven.plugins.maven-install-plugin.version>3.1.4</org.apache.maven.plugins.maven-install-plugin.version>
172-
<org.apache.maven.plugins-maven-jar-plugin.version>3.4.2</org.apache.maven.plugins-maven-jar-plugin.version>
172+
<org.apache.maven.plugins-maven-jar-plugin.version>3.5.0</org.apache.maven.plugins-maven-jar-plugin.version>
173173
<org.apache.maven.plugins.maven-javadoc-plugin.version>3.12.0</org.apache.maven.plugins.maven-javadoc-plugin.version>
174174
<org.apache.maven.plugins-maven-pmd-plugin.version>3.28.0</org.apache.maven.plugins-maven-pmd-plugin.version>
175175
<org.apache.maven.plugins.maven-release-plugin.version>3.2.0</org.apache.maven.plugins.maven-release-plugin.version>

0 commit comments

Comments
 (0)