From 2d8b2d7d7edbbee2a154ed0cb36bbed27f185fd2 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 26 May 2023 11:25:09 -0400
Subject: [PATCH] fixes

---
 Testing/build.xml                                              | 1 +
 .../src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java    | 3 ++-
 test/script/regression.py                                      | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Testing/build.xml b/Testing/build.xml
index eea244f7ef..8fd1aaa89c 100644
--- a/Testing/build.xml
+++ b/Testing/build.xml
@@ -58,6 +58,7 @@
                 <classpath refid="test.classpath"/>
                 <syspropertyset refid="test.@{test.type}.properties"/>
                 <jvmarg line="${test.bootclasspath.prepend.args}"/>
+                <jvmarg line="--add-opens=java.base/java.security=ALL-UNNAMED"/>
                 <jvmarg line="${test.run.args}"/>
                 <!--  should be in sync with project.properties and build.xml of autopsy main project -->
                 <!-- disable for now, causes issues with Java 7 -->
diff --git a/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java b/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
index dd7593eceb..1507e14792 100644
--- a/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
+++ b/Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
@@ -68,6 +68,7 @@ import org.netbeans.jemmy.operators.JLabelOperator;
 import org.netbeans.jemmy.operators.JListOperator;
 import org.netbeans.jemmy.operators.JTabbedPaneOperator;
 import org.netbeans.jemmy.operators.JTableOperator;
+import org.netbeans.jemmy.operators.JTextAreaOperator;
 import org.netbeans.jemmy.operators.JTextFieldOperator;
 import org.netbeans.jemmy.operators.JToggleButtonOperator;
 import org.netbeans.jemmy.operators.JTreeOperator;
@@ -438,7 +439,7 @@ public class AutopsyTestCases {
             jbo1.pushNoBlock();
             JDialog previewDialog = JDialogOperator.waitJDialog("Progress", false, false);
             JDialogOperator previewDialogOperator = new JDialogOperator(previewDialog);
-            JLabelOperator.waitJLabel(previewDialog, "Complete", false, false);
+            JTextAreaOperator.waitJTextArea(previewDialog, "Complete", false, false);
             JButtonOperator jbo2 = new JButtonOperator(previewDialogOperator, "Close");
             jbo2.pushNoBlock();
             new Timeout("pausing", 10000).sleep();
diff --git a/test/script/regression.py b/test/script/regression.py
index 89054fe019..e898bec3e5 100644
--- a/test/script/regression.py
+++ b/test/script/regression.py
@@ -464,7 +464,6 @@ class TestRunner(object):
         test_data.ant.append("regression-test")
         test_data.ant.append("-l")
         test_data.ant.append(test_data.antlog_dir)
-        test_data.ant.append("-J--add-opens=java.base/java.security=ALL-UNNAMED")
         test_data.ant.append("-Dimg_path=" + test_data.image_file)
         test_data.ant.append("-Dknown_bad_path=" + test_config.known_bad_path)
         test_data.ant.append("-Dkeyword_path=" + test_config.keyword_path)