From 66971600f7ba796ff5bb9714591c3faa0bb2249d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= <eirbjo@openjdk.org>
Date: Wed, 31 Jan 2024 13:59:19 +0000
Subject: [PATCH] 8320712: Rewrite BadFactoryTest in pure Java

Reviewed-by: jpai, sundar
---
 .../script/JDK_8196959/BadFactoryTest.java    | 30 +++++++++-
 .../script/JDK_8196959/BadFactoryTest.sh      | 60 -------------------
 2 files changed, 27 insertions(+), 63 deletions(-)
 delete mode 100644 test/jdk/javax/script/JDK_8196959/BadFactoryTest.sh

diff --git a/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java b/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
index 9f02c61511d..36e3391be7f 100644
--- a/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
+++ b/test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, 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
@@ -21,10 +21,34 @@
  * questions.
  */
 
-import javax.script.ScriptEngineManager;
+import org.junit.jupiter.api.Test;
 
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/*
+ * @test
+ * @bug 8196959 8320712
+ * @summary Verify that ScriptEngineManager can load BadFactory without throwing NPE
+ * @build BadFactory BadFactoryTest
+ * @run junit/othervm BadFactoryTest
+ * @run junit/othervm -Djava.security.manager=allow BadFactoryTest
+ */
 public class BadFactoryTest {
-    public static void main(String[] args) {
+
+    @Test
+    public void scriptEngineManagerShouldLoadBadFactory() {
+        // Check that ScriptEngineManager initializes even in the
+        // presence of a ScriptEngineFactory returning nulls
         ScriptEngineManager m = new ScriptEngineManager();
+
+        // Sanity check that ScriptEngineManager actually found the BadFactory
+        Optional<ScriptEngineFactory> badFactory = m.getEngineFactories().stream()
+                .filter(fac -> fac.getClass() == BadFactory.class)
+                .findAny();
+        assertTrue(badFactory.isPresent(), "BadFactory not found");
     }
 }
diff --git a/test/jdk/javax/script/JDK_8196959/BadFactoryTest.sh b/test/jdk/javax/script/JDK_8196959/BadFactoryTest.sh
deleted file mode 100644
index e5d1a063840..00000000000
--- a/test/jdk/javax/script/JDK_8196959/BadFactoryTest.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (c) 2018, 2023, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 8196959
-# @summary BadFactory that results in NPE being thrown from ScriptEngineManager
-#
-# @build BadFactory BadFactoryTest
-# @run shell BadFactoryTest.sh
-
-if [ "${TESTSRC}" = "" ]
-then
-  echo "TESTSRC not set.  Test cannot execute.  Failed."
-  exit 1
-fi
-
-. ${TESTSRC}/../CommonSetup.sh
-
-echo "Creating JAR file ..."
-
-$JAR ${TESTTOOLVMOPTS} -cf ${TESTCLASSES}/badfactory.jar \
-    -C ${TESTCLASSES} BadFactory.class \
-    -C ${TESTCLASSES} BadFactoryTest.class \
-    -C "${TESTSRC}" META-INF/services/javax.script.ScriptEngineFactory
-
-echo "Running test with security manager ..."
-$JAVA ${TESTVMOPTS} -Djava.security.manager -classpath \
-  "${TESTCLASSES}${PS}${TESTCLASSES}/badfactory.jar" \
-  BadFactoryTest
-
-ret=$?
-if [ $ret -ne 0 ]
-then
-  exit $ret
-fi
-
-echo "Running test without security manager ..."
-$JAVA ${TESTVMOPTS} -classpath \
-  "${TESTCLASSES}${PS}${TESTCLASSES}/badfactory.jar" \
-  BadFactoryTest