Fix Java 21 failures

Ericsson · Aug 30, 2024 · 2b2fe7d · 2b2fe7d
1 parent f9c00a5
commit 2b2fe7d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -82,14 +82,10 @@ jobs:
           # Java 21 tests
           - name: "Unit tests - Java 21"
             java_version: 21
-            test_suite: 'test -Djava.version=21 jacoco:report'
+            test_suite: 'test -Dnet.bytebuddy.experimental=true -Djava.version=21 jacoco:report'
           - name: "Style check - Java 21"
             java_version: 21
             test_suite: 'compile -Djava.version=21 com.mycila:license-maven-plugin:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check javadoc:jar'
-          - name: "OSGi integration - Java 21"
-            java_version: 21
-            test_suite: 'install -P docker-integration-test,osgi-integration-tests -DskipUTs -Djava.version=21'
-            artifacts_dir: "osgi-integration/target"
           - name: "Standalone integration 4.0 - Java 21"
             java_version: 21
             test_suite: 'verify -P docker-integration-test,standalone-integration-tests -DskipUTs -Djava.version=21'

diff --git a/...sson/bss/cassandra/ecchronos/core/repair/state/TestFullyRepairedRepairEntryPredicate.java b/...sson/bss/cassandra/ecchronos/core/repair/state/TestFullyRepairedRepairEntryPredicate.java
@@ -17,7 +17,10 @@
 import com.ericsson.bss.cassandra.ecchronos.core.utils.LongTokenRange;
 import com.ericsson.bss.cassandra.ecchronos.core.utils.DriverNode;
 import com.google.common.collect.Sets;
+
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.MockitoAnnotations;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -40,6 +43,11 @@ public class TestFullyRepairedRepairEntryPredicate
     private static final String FAILED = "FAILED";
     private static final String SUCCESS = "SUCCESS";
 
+    @Before
+    public void setUp() {
+        MockitoAnnotations.openMocks(this);
+    }
+
     @Test
     public void testAcceptUnknown() throws UnknownHostException
     {
@@ -68,7 +76,7 @@ public void testAcceptSuccess() throws UnknownHostException
     public void testAcceptSuccessMultipleRanges() throws UnknownHostException
     {
         List<LongTokenRange> expectedRepairedTokenRanges = new ArrayList<>();
-        Set<InetAddress> expectedRepairedNodeAddresses = Sets.newHashSet(InetAddress.getLocalHost());
+        Set<InetAddressWrapper> expectedRepairedNodeAddresses = Sets.newHashSet(new InetAddressWrapper(InetAddress.getLocalHost()));
         Set<DriverNode> expectedRepairedNodes = expectedRepairedNodeAddresses.stream().map(this::mockNode).collect(Collectors.toSet());
 
         Map<LongTokenRange, Collection<DriverNode>> tokenToNodeMap = new HashMap<>();
@@ -90,11 +98,12 @@ public void testAcceptSuccessMultipleRanges() throws UnknownHostException
     public void testAcceptPartialSuccess() throws UnknownHostException
     {
         LongTokenRange expectedRepairedTokenRange = new LongTokenRange(0, 1);
-        DriverNode repairedNode = mockNode(InetAddress.getLocalHost());
+        InetAddressWrapper addressWrapper = new InetAddressWrapper(InetAddress.getLocalHost());
+        DriverNode repairedNode = mockNode(addressWrapper);
         Set<DriverNode> repairedNodes = Sets.newHashSet(repairedNode);
         Set<DriverNode> allNodes = new HashSet<>();
         allNodes.add(repairedNode);
-        allNodes.add(mockNode(mock(InetAddress.class)));
+        allNodes.add(mockNode(mock(InetAddressWrapper.class)));
 
         Map<LongTokenRange, Collection<DriverNode>> tokenToNodeMap = new HashMap<>();
         tokenToNodeMap.put(expectedRepairedTokenRange, allNodes);
@@ -107,7 +116,7 @@ public void testAcceptNonExistingTokenRangeSuccess() throws UnknownHostException
     {
         LongTokenRange repairedTokenRange = new LongTokenRange(0, 1);
         LongTokenRange actualTokenRange = new LongTokenRange(0, 2);
-        Set<InetAddress> expectedRepairedNodeAddresses = Sets.newHashSet(InetAddress.getLocalHost());
+        Set<InetAddressWrapper> expectedRepairedNodeAddresses = Sets.newHashSet(new InetAddressWrapper(InetAddress.getLocalHost()));
         Set<DriverNode> expectedRepairedNodes = expectedRepairedNodeAddresses.stream().map(this::mockNode).collect(Collectors.toSet());
 
         Map<LongTokenRange, Collection<DriverNode>> tokenToNodeMap = new HashMap<>();
@@ -119,7 +128,7 @@ public void testAcceptNonExistingTokenRangeSuccess() throws UnknownHostException
     private boolean applyWith(String status) throws UnknownHostException
     {
         LongTokenRange expectedRepairedTokenRange = new LongTokenRange(0, 1);
-        Set<InetAddress> expectedRepairedNodeAddresses = Sets.newHashSet(InetAddress.getLocalHost());
+        Set<InetAddressWrapper> expectedRepairedNodeAddresses = Sets.newHashSet(new InetAddressWrapper(InetAddress.getLocalHost()));
         Set<DriverNode> expectedRepairedNodes = expectedRepairedNodeAddresses.stream().map(this::mockNode).collect(Collectors.toSet());
 
         Map<LongTokenRange, Collection<DriverNode>> tokenToNodeMap = new HashMap<>();
@@ -136,12 +145,30 @@ private boolean applyWith(LongTokenRange repairedTokenRange, Map<LongTokenRange,
         return fullyRepairedRepairEntryPredicate.apply(repairEntry);
     }
 
-    private DriverNode mockNode(InetAddress inetAddress)
+    private DriverNode mockNode(InetAddressWrapper inetAddressWrapper)
     {
         DriverNode node = mock(DriverNode.class);
 
+        InetAddress inetAddress = inetAddressWrapper.getInetAddress();
+
         when(node.getPublicAddress()).thenReturn(inetAddress);
 
         return node;
     }
+
+    private class InetAddressWrapper
+    {
+        private final InetAddress inetAddress;
+
+        public InetAddressWrapper(InetAddress inetAddress)
+        {
+            this.inetAddress = inetAddress;
+        }
+
+        public InetAddress getInetAddress()
+        {
+            return inetAddress;
+        }
+    }
+
 }