Merge pull request #25013 from vespa-engine/balder/avoid-biz-aQute-2

Use a simple tokenizer and replace the larger than container-search [run-systemtest]

1 files changed, 15 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
index e26a8e8bac6..5cd7880e22d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -98,4 +99,18 @@ public class BundleValidatorTest {
         return new JarFile(jarFile.toFile());
     }
 
+    private void verifyParsing(String text, List<String> expected) {
+        TokenizeAndDeQuote tokenizer = new TokenizeAndDeQuote(";,=", "\"'");
+        var words = tokenizer.tokenize(text);
+        assertEquals(expected, words);
+    }
+
+    @Test
+    void testImportPackagesParsing() {
+        verifyParsing("org.json;version=\"[0.0.0,1)\",org.eclipse.jetty.client.api;version=\"[9.4.46,10)\"",
+                List.of("org.json", "version", "[0.0.0,1)", "org.eclipse.jetty.client.api", "version", "[9.4.46,10)"));
+        verifyParsing("org.json;version='[0.0.0,1)',org.eclipse.jetty.client.api;version='[9.4.46,10)'",
+                List.of("org.json", "version", "[0.0.0,1)", "org.eclipse.jetty.client.api", "version", "[9.4.46,10)"));
+    }
+
 }