Ad Workaround for new JMeters

undera · Jan 21, 2025 · 2a3d14d · 2a3d14d
1 parent 71cc46d
commit 2a3d14d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 0 deletions.
diff --git a/plugins/casutg/src/test/java/com/blazemeter/jmeter/control/VirtualUserControllerTest.java b/plugins/casutg/src/test/java/com/blazemeter/jmeter/control/VirtualUserControllerTest.java
@@ -4,6 +4,7 @@
 import com.blazemeter.jmeter.threads.arrivals.ArrivalsThreadGroupTest;
 import kg.apc.emulators.TestJMeterUtils;
 import org.apache.jmeter.sampler.DebugSampler;
+import org.apache.jmeter.util.JMeterUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -15,6 +16,9 @@ public class VirtualUserControllerTest {
     public static void setUpClass() throws Exception {
         ArrivalsThreadGroupTest.setUpClass();
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @Test

diff --git a/...sutg/src/test/java/com/blazemeter/jmeter/threads/arrivals/ArrivalsThreadGroupGuiTest.java b/...sutg/src/test/java/com/blazemeter/jmeter/threads/arrivals/ArrivalsThreadGroupGuiTest.java
@@ -2,6 +2,7 @@
 
 import kg.apc.emulators.TestJMeterUtils;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -15,6 +16,9 @@ public class ArrivalsThreadGroupGuiTest {
     @BeforeClass
     public static void setUpClass() throws IOException {
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @Test

diff --git a/.../test/java/com/blazemeter/jmeter/threads/arrivals/FreeFormArrivalsThreadGroupGuiTest.java b/.../test/java/com/blazemeter/jmeter/threads/arrivals/FreeFormArrivalsThreadGroupGuiTest.java
@@ -1,6 +1,7 @@
 package com.blazemeter.jmeter.threads.arrivals;
 
 import kg.apc.emulators.TestJMeterUtils;
+import org.apache.jmeter.util.JMeterUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -12,6 +13,9 @@ public class FreeFormArrivalsThreadGroupGuiTest {
     @BeforeClass
     public static void setUpClass() throws IOException {
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @Test

diff --git a/...c/test/java/com/blazemeter/jmeter/threads/arrivals/FreeFormArrivalsThreadStarterTest.java b/...c/test/java/com/blazemeter/jmeter/threads/arrivals/FreeFormArrivalsThreadStarterTest.java
@@ -5,6 +5,7 @@
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.threads.ListenerNotifier;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
@@ -19,6 +20,9 @@ public class FreeFormArrivalsThreadStarterTest {
     @BeforeClass
     public static void setUp() throws Exception {
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @Test

diff --git a/...g/src/test/java/com/blazemeter/jmeter/threads/concurrency/ConcurrencyThreadGroupTest.java b/...g/src/test/java/com/blazemeter/jmeter/threads/concurrency/ConcurrencyThreadGroupTest.java
@@ -25,6 +25,7 @@
 import org.apache.jmeter.threads.ListenerNotifier;
 import org.apache.jmeter.threads.TestCompiler;
 import org.apache.jmeter.timers.ConstantTimer;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -38,6 +39,9 @@ public class ConcurrencyThreadGroupTest {
     public static void setUpClass() throws Exception {
         ArrivalsThreadGroupTest.setUpClass();
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @Test

diff --git a/...src/test/java/com/blazemeter/jmeter/threads/concurrency/ConcurrencyThreadStarterTest.java b/...src/test/java/com/blazemeter/jmeter/threads/concurrency/ConcurrencyThreadStarterTest.java
@@ -2,6 +2,7 @@
 
 import com.blazemeter.jmeter.threads.arrivals.ArrivalsThreadGroupTest;
 import kg.apc.emulators.TestJMeterUtils;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -12,6 +13,9 @@ public class ConcurrencyThreadStarterTest {
     @BeforeClass
     public static void setUpClass() {
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @Test(timeout = 1000)

diff --git a/plugins/casutg/src/test/java/kg/apc/jmeter/threads/SteppingThreadGroupGuiTest.java b/plugins/casutg/src/test/java/kg/apc/jmeter/threads/SteppingThreadGroupGuiTest.java
@@ -2,6 +2,7 @@
 
 import kg.apc.emulators.TestJMeterUtils;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.JMeterUtils;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -24,6 +25,9 @@ public SteppingThreadGroupGuiTest() {
     @BeforeClass
     public static void setUpClass() throws Exception {
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     /**

diff --git a/plugins/casutg/src/test/java/kg/apc/jmeter/threads/UltimateThreadGroupTest.java b/plugins/casutg/src/test/java/kg/apc/jmeter/threads/UltimateThreadGroupTest.java
@@ -25,6 +25,9 @@ public UltimateThreadGroupTest() {
     @BeforeClass
     public static void setUpClass() throws Exception {
         TestJMeterUtils.createJmeterEnv();
+        // Workaround for new JMeters
+        JMeterUtils.setProperty("saveservice_properties", JMeterUtils.getJMeterHome() + "/ss.props");
+        JMeterUtils.setProperty("upgrade_properties", JMeterUtils.getJMeterHome() + "/ss.props");
     }
 
     @AfterClass