From 2e2d9c57a39425273d12b49183b55b46b5c680b2 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@vespa.ai>
Date: Mon, 17 Apr 2023 13:42:05 +0200
Subject: Build with jdk20

---
 .../src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'jdisc_core/src')

diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java
index e9aba0893f9..7ec3406be1f 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java
@@ -62,8 +62,8 @@ public class ExportPackagesIT {
         String expectedValue = expectedProperties.getProperty(ExportPackages.EXPORT_PACKAGES);
         assertNotNull(expectedValue, "Missing exportPackages property in file.");
 
-        Set<String> actualPackages = getPackages(actualValue);
-        Set<String> expectedPackages = getPackages(expectedValue);
+        Set<String> actualPackages = removeNewPackageOnJava20(removeJavaVersion(getPackages(actualValue)));
+        Set<String> expectedPackages = removeNewPackageOnJava20(removeJavaVersion(getPackages(expectedValue)));
         if (!actualPackages.equals(expectedPackages)) {
             StringBuilder message = getDiff(actualPackages, expectedPackages);
             message.append("\n\nIf this test fails due to an intentional change in exported packages, run the following command:\n")
@@ -73,6 +73,14 @@ public class ExportPackagesIT {
         }
     }
 
+    private static Set<String> removeJavaVersion(Set<String> packages) {
+        return packages.stream().map(p -> p.replaceAll(".JavaSE_\\d+", "")).collect(Collectors.toSet());
+    }
+
+    private static Set<String> removeNewPackageOnJava20(Set<String> packages) {
+        return packages.stream().filter(p -> ! p.contains("java.lang.foreign")).collect(Collectors.toSet());
+    }
+
     private static StringBuilder getDiff(Set<String> actual, Set<String> expected) {
         StringBuilder sb = new StringBuilder();
         Set<String> onlyInActual = onlyInSet1(actual, expected);
-- 
cgit v1.2.3