Merge pull request #26153 from vespa-engine/revert-26145-bjorncs/capabilities

Revert "Store original capability (set) names from JSON config in PeerPolicy" MERGEOK

1 files changed, 5 insertions, 3 deletions

diff --git a/security-utils/src/test/java/com/yahoo/security/tls/CapabilitySetTest.java b/security-utils/src/test/java/com/yahoo/security/tls/CapabilitySetTest.java
index 3fa75df27e1..87b16dbff1f 100644
--- a/security-utils/src/test/java/com/yahoo/security/tls/CapabilitySetTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/tls/CapabilitySetTest.java
@@ -4,6 +4,8 @@ package com.yahoo.security.tls;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -15,10 +17,10 @@ class CapabilitySetTest {
 
     @Test
     void contains_all_capabilities() {
-        var expectedNames = Arrays.stream(Capability.values())
+        SortedSet<String> expectedNames = Arrays.stream(Capability.values())
                 .map(Capability::asString)
-                .collect(Collectors.toSet());
-        var actualNames = CapabilitySet.all().toCapabilityNames();
+                .collect(Collectors.toCollection(TreeSet::new));
+        SortedSet<String> actualNames = CapabilitySet.all().toNames();
         assertEquals(expectedNames, actualNames);
     }