jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1511216 - in /jmeter/trunk: bin/testfiles/Bug47165.csv bin/testfiles/Bug47165.jmx bin/testfiles/Bug47165.xml build.xml
Date Wed, 07 Aug 2013 09:09:17 GMT
Author: sebb
Date: Wed Aug  7 09:09:17 2013
New Revision: 1511216

URL: http://svn.apache.org/r1511216
Log:
Add test for Bug 47165 to guard against regression

Added:
    jmeter/trunk/bin/testfiles/Bug47165.csv   (with props)
    jmeter/trunk/bin/testfiles/Bug47165.jmx   (with props)
    jmeter/trunk/bin/testfiles/Bug47165.xml   (with props)
Modified:
    jmeter/trunk/build.xml

Added: jmeter/trunk/bin/testfiles/Bug47165.csv
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug47165.csv?rev=1511216&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug47165.csv (added)
+++ jmeter/trunk/bin/testfiles/Bug47165.csv Wed Aug  7 09:09:17 2013
@@ -0,0 +1 @@
+label,responseCode,responseMessage,threadName,dataType,success,bytes,Latency

Propchange: jmeter/trunk/bin/testfiles/Bug47165.csv
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jmeter/trunk/bin/testfiles/Bug47165.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug47165.jmx?rev=1511216&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug47165.jmx (added)
+++ jmeter/trunk/bin/testfiles/Bug47165.jmx Wed Aug  7 09:09:17 2013
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.1">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Bug47165" enabled="true">
+      <stringProp name="TestPlan.comments">Causes NPE when run in non-GUI mode on 2.3.2
and earler</stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel"
testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"></stringProp>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread
Group" enabled="false">
+        <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>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1375864955000</longProp>
+        <longProp name="ThreadGroup.end_time">1375864955000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController"
testname="Simple Controller" enabled="true"/>
+        <hashTree>
+          <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Test"
enabled="true">
+            <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel"
testclass="Arguments" enabled="true">
+              <collectionProp name="Arguments.arguments">
+                <elementProp name="Sleep_Time" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Time</stringProp>
+                  <stringProp name="Argument.value">100</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Sleep_Mask" elementType="Argument">
+                  <stringProp name="Argument.name">Sleep_Mask</stringProp>
+                  <stringProp name="Argument.value">0xFF</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Label" elementType="Argument">
+                  <stringProp name="Argument.name">Label</stringProp>
+                  <stringProp name="Argument.value"></stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseCode" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseCode</stringProp>
+                  <stringProp name="Argument.value"></stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResponseMessage" elementType="Argument">
+                  <stringProp name="Argument.name">ResponseMessage</stringProp>
+                  <stringProp name="Argument.value"></stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="Status" elementType="Argument">
+                  <stringProp name="Argument.name">Status</stringProp>
+                  <stringProp name="Argument.value">OK</stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="SamplerData" elementType="Argument">
+                  <stringProp name="Argument.name">SamplerData</stringProp>
+                  <stringProp name="Argument.value"></stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+                <elementProp name="ResultData" elementType="Argument">
+                  <stringProp name="Argument.name">ResultData</stringProp>
+                  <stringProp name="Argument.value"></stringProp>
+                  <stringProp name="Argument.metadata">=</stringProp>
+                </elementProp>
+              </collectionProp>
+            </elementProp>
+            <stringProp name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp>
+          </JavaSampler>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread
Group" enabled="true">
+        <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>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+        <longProp name="ThreadGroup.start_time">1375865019000</longProp>
+        <longProp name="ThreadGroup.end_time">1375865019000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController"
testname="Module Controller" enabled="true">
+          <collectionProp name="ModuleController.node_path">
+            <stringProp name="-1227702913">WorkBench</stringProp>
+            <stringProp name="764597751">Test Plan</stringProp>
+            <stringProp name="-1948168983">Thread Group</stringProp>
+            <stringProp name="-1591803190">Simple Controller</stringProp>
+          </collectionProp>
+        </ModuleController>
+        <hashTree/>
+        <ModuleController guiclass="ModuleControllerGui" testclass="ModuleController"
testname="Module Controller" enabled="true">
+          <collectionProp name="ModuleController.node_path">
+            <stringProp name="-1227702913">WorkBench</stringProp>
+            <stringProp name="764597751">Test Plan</stringProp>
+            <stringProp name="-1948168983">Thread Group</stringProp>
+            <stringProp name="-1591803190">Simple Controller</stringProp>
+          </collectionProp>
+        </ModuleController>
+        <hashTree/>
+      </hashTree>
+      <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector"
testname="View Results Tree" enabled="true">
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+        <objProp>
+          <name>saveConfig</name>
+          <value class="SampleSaveConfiguration">
+            <time>false</time>
+            <latency>true</latency>
+            <timestamp>false</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>false</xml>
+            <fieldNames>true</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+            <bytes>true</bytes>
+          </value>
+        </objProp>
+        <stringProp name="filename">Bug47165.csv</stringProp>
+      </ResultCollector>
+      <hashTree/>
+      <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple
Data Writer" enabled="true">
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+        <objProp>
+          <name>saveConfig</name>
+          <value class="SampleSaveConfiguration">
+            <time>false</time>
+            <latency>true</latency>
+            <timestamp>false</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>true</xml>
+            <fieldNames>false</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+            <bytes>true</bytes>
+          </value>
+        </objProp>
+        <stringProp name="filename">Bug47165.xml</stringProp>
+      </ResultCollector>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>

Propchange: jmeter/trunk/bin/testfiles/Bug47165.jmx
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: jmeter/trunk/bin/testfiles/Bug47165.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug47165.xml?rev=1511216&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug47165.xml (added)
+++ jmeter/trunk/bin/testfiles/Bug47165.xml Wed Aug  7 09:09:17 2013
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testResults version="1.2">
+
+</testResults>

Propchange: jmeter/trunk/bin/testfiles/Bug47165.xml
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1511216&r1=1511215&r2=1511216&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Wed Aug  7 09:09:17 2013
@@ -1329,9 +1329,7 @@ run JMeter unless all the JMeter jars ar
     <exclude name="${dest.jar.jmeter}/testfiles/*.jtl"/>
     <!-- These are generated with EOL=LF -->
     <exclude name="${dest.jar.jmeter}/testfiles/BatchTestLocal.xml"/>
-    <exclude name="${dest.jar.jmeter}/testfiles/Bug50898.xml"/>
-    <exclude name="${dest.jar.jmeter}/testfiles/Bug52310.xml"/>
-    <exclude name="${dest.jar.jmeter}/testfiles/Bug52968.xml"/>
+    <exclude name="${dest.jar.jmeter}/testfiles/Bug*.xml"/>
     <exclude name="${dest.jar.jmeter}/testfiles/HTMLParserTestFile_2.xml"/>
     <!-- Ignore unit test output -->
     <exclude name="${dest.jar.jmeter}/testfiles/*.out"/>
@@ -1360,9 +1358,7 @@ run JMeter unless all the JMeter jars ar
     <include name="${dest.jar.jmeter}/testfiles/*.jtl"/>
     <!-- These are generated with EOL=LF -->
     <include name="${dest.jar.jmeter}/testfiles/BatchTestLocal.xml"/>
-    <include name="${dest.jar.jmeter}/testfiles/Bug50898.xml"/>
-    <include name="${dest.jar.jmeter}/testfiles/Bug52310.xml"/>
-    <include name="${dest.jar.jmeter}/testfiles/Bug52968.xml"/>
+    <include name="${dest.jar.jmeter}/testfiles/Bug*.xml"/>
     <include name="${dest.jar.jmeter}/testfiles/HTMLParserTestFile_2.xml"/>
     <!-- Include the image files used in parsing / embedded download tests -->
     <include name="${dest.jar.jmeter}/testfiles/**/*.gif"/>
@@ -2571,6 +2567,10 @@ run JMeter unless all the JMeter jars ar
           <param name="batchtest.name" value="HTMLParserTestFile_2"/>
       </antcall>
       <antcall target="batchtest">
+          <!--  Using the same module controller name in command line mode causes NPE
-->
+          <param name="batchtest.name" value="Bug47165"/>
+      </antcall>
+      <antcall target="batchtest">
           <!--  variable in IPSource failed HTTP request if "Concurrent Pool Size" is
enabled -->
           <!-- N.B. requires access to jmeter.apache.org -->
           <param name="batchtest.name" value="Bug52310"/>



Mime
View raw message