You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by un...@apache.org on 2016/08/11 10:27:45 UTC
svn commit: r1755929 - in /jmeter/trunk: bin/testfiles/
src/core/org/apache/jmeter/reporters/ xdocs/
Author: undera
Date: Thu Aug 11 10:27:45 2016
New Revision: 1755929
URL: http://svn.apache.org/viewvc?rev=1755929&view=rev
Log:
Bug 59973 - Issue with XML version in JTL files
Modified:
jmeter/trunk/bin/testfiles/BatchTestLocal.xml
jmeter/trunk/bin/testfiles/BatchTestLocalRemote.xml
jmeter/trunk/bin/testfiles/Bug47165.xml
jmeter/trunk/bin/testfiles/Bug50898.xml
jmeter/trunk/bin/testfiles/Bug52310.xml
jmeter/trunk/bin/testfiles/Bug52968.xml
jmeter/trunk/bin/testfiles/Bug54685.xml
jmeter/trunk/bin/testfiles/Bug55375.xml
jmeter/trunk/bin/testfiles/Bug56243.xml
jmeter/trunk/bin/testfiles/Bug56811.xml
jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml
jmeter/trunk/bin/testfiles/TEST_HTTPS.xml
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/testfiles/BatchTestLocal.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/BatchTestLocal.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/BatchTestLocal.xml (original)
+++ jmeter/trunk/bin/testfiles/BatchTestLocal.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="Setup 1" rc="200" rm="OK" tn="Setup Thread Group 1-1" dt="text" by="0" sc="1" ec="0" ng="1" na="1">
<responseHeader class="java.lang.String"></responseHeader>
Modified: jmeter/trunk/bin/testfiles/BatchTestLocalRemote.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/BatchTestLocalRemote.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/BatchTestLocalRemote.xml (original)
+++ jmeter/trunk/bin/testfiles/BatchTestLocalRemote.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="Setup 1" rc="200" rm="OK" tn="Setup Thread Group 1-1" dt="" by="0" sc="1" ec="0" ng="1" na="1">
<responseHeader class="java.lang.String"></responseHeader>
Modified: jmeter/trunk/bin/testfiles/Bug47165.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug47165.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug47165.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug47165.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
</testResults>
Modified: jmeter/trunk/bin/testfiles/Bug50898.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug50898.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug50898.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug50898.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample lt="0" s="true" lb="Java Request" rc="" rm="" tn="Thread Group 1-1" dt="text" by="0"/>
<sample lt="0" s="true" lb="Java Request" rc="" rm="" tn="Thread Group 1-1" dt="text" by="0"/>
Modified: jmeter/trunk/bin/testfiles/Bug52310.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug52310.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug52310.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug52310.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="ComputeIPAddr" rc="200" rm="OK" dt="text"/>
<httpSample s="true" lb="HTTP-Request-HC31" rc="200" rm="OK" dt="text">
Modified: jmeter/trunk/bin/testfiles/Bug52968.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug52968.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug52968.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug52968.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="TNP1-JR0-0" rc="200" rm="" dt="text" sc="1" ec="0" ng="1" na="1"/>
<sample s="true" lb="TC-NOPARENT-1" rc="200" rm="Number of samples in transaction : 1, number of failing samples : 0" dt="" sc="1" ec="0" ng="1" na="1"/>
Modified: jmeter/trunk/bin/testfiles/Bug54685.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug54685.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug54685.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug54685.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="sample_variables=REFERENCE,JSESSIONID REFERENCE=reference JSESSIONID=jsessionId" rc="" rm="" tn="Thread Group 1-1" dt="text" by="0" REFERENCE="reference" JSESSIONID="jsessionId"/>
Modified: jmeter/trunk/bin/testfiles/Bug55375.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug55375.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug55375.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug55375.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="reload" rc="" rm="" tn="threadgroup 1-1" dt="text" by="0" sc="1" ec="0"/>
Modified: jmeter/trunk/bin/testfiles/Bug56243.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug56243.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug56243.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug56243.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="true" lb="Starting iteration" rc="200" rm="OK" dt="text" sc="1" ec="0" ng="1" na="1"/>
<sample s="true" lb="Debug RE" rc="200" rm="OK" dt="text" sc="1" ec="0" ng="1" na="1"/>
Modified: jmeter/trunk/bin/testfiles/Bug56811.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug56811.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/Bug56811.xml (original)
+++ jmeter/trunk/bin/testfiles/Bug56811.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<sample s="false" lb="01 Transaction Controller" rc="200" rm="Number of samples in transaction : 1, number of failing samples : 1" tn="TG-UsingTCwithGenerateParentSample 1-1" dt="" by="5" sc="1" ec="1" ng="1" na="1">
<sample s="false" lb="Transaction Controller1" rc="200" rm="Number of samples in transaction : 1, number of failing samples : 1" tn="TG-UsingTCwithGenerateParentSample 1-1" dt="" by="5" sc="1" ec="1" ng="1" na="1">
Modified: jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml (original)
+++ jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<httpSample s="true" lb="Download embedded" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="76144" sc="1" ec="0" ng="1" na="1">
<httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="40174" sc="1" ec="0" ng="1" na="1">
Modified: jmeter/trunk/bin/testfiles/TEST_HTTPS.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTPS.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTPS.xml (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTPS.xml Thu Aug 11 10:27:45 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.1" encoding="UTF-8"?>
<testResults version="1.2">
<httpSample s="true" lb="HTTPS-SNI" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" sc="1" ec="0" ng="1" na="1">
<assertionResult>
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Thu Aug 11 10:27:45 2016
@@ -79,7 +79,7 @@ public class ResultCollector extends Abs
private static final String TESTRESULTS_END = "</testResults>"; // $NON-NLS-1$
- private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; // $NON-NLS-1$
+ private static final String XML_HEADER = "<?xml version=\"1.1\" encoding=\"UTF-8\"?>"; // $NON-NLS-1$
private static final int MIN_XML_FILE_LEN = XML_HEADER.length() + TESTRESULTS_START.length()
+ TESTRESULTS_END.length();
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1755929&r1=1755928&r2=1755929&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Aug 11 10:27:45 2016
@@ -150,6 +150,7 @@ Summary
<ul>
<li><bug>58888</bug>HTTP(S) Test Script Recorder (ProxyControl) does not add TestElement's returned by SamplerCreator createChildren ()</li>
<li><bug>59902</bug>Https handshake failure when setting <code>httpclient.socket.https.cps</code> property</li>
+ <li><bug>59973</bug>XML version in JTL files is changed into 1.1 to match serializer output. Implemented by Andrey Pokhilko (andrey at blazemeter.com) and contributed by BlazeMeter Ltd.</li>
</ul>
<h3>Other Samplers</h3>