8281634: jdeps: java.lang.InternalError: Missing message: err.invalid.filters

src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -241,6 +241,7 @@ err.module.not.found=module not found: {0}
 err.root.module.not.set=root module set empty
 err.option.already.specified={0} option specified more than once.
 err.filter.not.specified=--package (-p), --regex (-e), --require option must be specified
+err.invalid.filters=Only one of --package (-p), --regex (-e), --require option can be specified
 err.multirelease.option.exists={0} is not a multi-release jar file but --multi-release option is set
 err.multirelease.option.notfound={0} is a multi-release jar file but --multi-release option is not set
 err.multirelease.version.associated=class {0} already associated with version {1}, trying to add version {2}

test/langtools/tools/jdeps/Options.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8168386 8205116
+ * @bug 8168386 8205116 8281634
  * @summary Test option validation
  * @modules jdk.jdeps
  * @library lib
@@ -48,11 +48,11 @@ public Object[][] errors() {
                 "-v, -verbose cannot be used with -s, -summary option"
             },
             {
-                new String[] { "-jdkinternal", "-summary", TEST_CLASSES },
+                new String[] { "-jdkinternals", "-summary", TEST_CLASSES },
                 "-summary or -verbose cannot be used with -jdkinternals option"
             },
             {
-                new String[] { "-jdkinternal", "-p", "java.lang", TEST_CLASSES },
+                new String[] { "-jdkinternals", "-p", "java.lang", TEST_CLASSES },
                 "--package, --regex, --require cannot be used with -jdkinternals option"
             },
             {
@@ -69,26 +69,30 @@ public Object[][] errors() {
             },
             {
                 new String[] { "--inverse", "-R", TEST_CLASSES },
-                "-R cannot be used with --inverse option"
+                "--recursive and --no-recursive cannot be used with --inverse option"
             },
             {
                 new String[] { "--generate-module-info", "dots", "-cp", TEST_CLASSES },
                 "-classpath cannot be used with --generate-module-info option"
             },
             {
                 new String[] { "--list-deps", "-summary", TEST_CLASSES },
-                "--list-deps and --list-reduced-deps options are specified"
+                "-summary or -verbose cannot be used with --list-deps option"
             },
             {
                 new String[] { "--list-deps", "--list-reduced-deps", TEST_CLASSES },
                 "--list-deps and --list-reduced-deps options are specified"
             },
+            {
+                new String[] { "--package", "sun.misc", "--require", "java.net.http" },
+                "Only one of --package (-p), --regex (-e), --require option can be specified"
+            }
         };
     }
 
     @Test(dataProvider = "errors")
     public void test(String[] options, String expected) {
-        jdepsError(options).outputContains(expected);
+        assertTrue(jdepsError(options).outputContains(expected));
     }
 
 
@@ -109,6 +113,6 @@ public void testSystemOption() {
         // invalid path
         jdeps = new JdepsRunner("--check", "java.base", "--system", "bad");
         assertTrue(jdeps.run(true) != 0);
-        jdeps.outputContains("invalid path: bad");
+        assertTrue(jdeps.outputContains("invalid path: bad"));
     }
 }