svn commit: r1812941 - in /jmeter/trunk/bin/testfiles: JMS_TESTS.jmx activemq.xml

[pm...@apache.org]

Author: pmouawad
Date: Sun Oct 22 18:57:04 2017
New Revision: 1812941

URL: http://svn.apache.org/viewvc?rev=1812941&view=rev
Log:
JMS : Increase coverage
Fix failure on Windows Jenkins by limiting storage and temp size

Added:
    jmeter/trunk/bin/testfiles/activemq.xml   (with props)
Modified:
    jmeter/trunk/bin/testfiles/JMS_TESTS.jmx

Modified: jmeter/trunk/bin/testfiles/JMS_TESTS.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/JMS_TESTS.jmx?rev=1812941&r1=1812940&r2=1812941&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/JMS_TESTS.jmx (original)
+++ jmeter/trunk/bin/testfiles/JMS_TESTS.jmx Sun Oct 22 18:57:04 2017
@@ -13,7 +13,7 @@
     </TestPlan>
     <hashTree>
       <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
-        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
@@ -27,17 +27,15 @@
       <hashTree>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BSS_startActiveMQ" enabled="true">
           <stringProp name="BeanShellSampler.query">import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.commons.io.FileUtils;
-FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;));
-BrokerService broker = new BrokerService();
-// configure the broker
-broker.addConnector(&quot;tcp://localhost:61616&quot;);
-broker.start();
-
 
+FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/activemq-data&quot;));
+BrokerService broker = BrokerFactory.createBroker(&quot;xbean://&quot;+JMeterUtils.getJMeterHome()+ &quot;/bin/testfiles/activemq.xml&quot;, true);
 bsh.shared.myMap = new HashMap();
-bsh.shared.myMap.put(&quot;ACTIVEMQ_BROKER&quot;, broker);</stringProp>
+bsh.shared.myMap.put(&quot;ACTIVEMQ_BROKER&quot;, broker);
+</stringProp>
           <stringProp name="BeanShellSampler.filename"></stringProp>
           <stringProp name="BeanShellSampler.parameters"></stringProp>
           <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>

Added: jmeter/trunk/bin/testfiles/activemq.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/activemq.xml?rev=1812941&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/activemq.xml (added)
+++ jmeter/trunk/bin/testfiles/activemq.xml Sun Oct 22 18:57:04 2017
@@ -0,0 +1,26 @@
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> 
+<broker xmlns="http://activemq.apache.org/schema/core" useJmx="false" persistent="false">
+    <transportConnectors>
+        <transportConnector uri="tcp://localhost:61616"/>
+    </transportConnectors>
+    <systemUsage>
+        <systemUsage>
+            <memoryUsage>
+                <memoryUsage limit="64 mb"/>
+            </memoryUsage>
+            <storeUsage>
+                <storeUsage limit="20000 mb"/>
+            </storeUsage>
+            <tempUsage>
+                <tempUsage limit="20000 mb"/>
+            </tempUsage>
+        </systemUsage>
+    </systemUsage>
+</broker>
+</beans>
\ No newline at end of file

Propchange: jmeter/trunk/bin/testfiles/activemq.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/bin/testfiles/activemq.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain