You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/17 19:54:00 UTC
svn commit: r1783456 - in /jmeter/trunk: bin/testfiles/
test/src/org/apache/jmeter/save/
Author: pmouawad
Date: Fri Feb 17 19:54:00 2017
New Revision: 1783456
URL: http://svn.apache.org/viewvc?rev=1783456&view=rev
Log:
Restore testloadAndSave
Modified:
jmeter/trunk/bin/testfiles/SavedGenTest210.jmx
jmeter/trunk/bin/testfiles/SavedGenTest27.jmx
jmeter/trunk/bin/testfiles/SavedGenTest2_13.jmx
jmeter/trunk/bin/testfiles/SavedGenTest3_0.jmx
jmeter/trunk/bin/testfiles/SavedGuiTest.jmx
jmeter/trunk/bin/testfiles/SavedGuiTest231.jmx
jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
Modified: jmeter/trunk/bin/testfiles/SavedGenTest210.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SavedGenTest210.jmx?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SavedGenTest210.jmx (original)
+++ jmeter/trunk/bin/testfiles/SavedGenTest210.jmx Fri Feb 17 19:54:00 2017
@@ -766,7 +766,7 @@
<collectionProp name="SMTPSampler.headerFields"/>
</SmtpSampler>
<hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="SOAP/XML-RPC Request" enabled="true">
+ <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -776,7 +776,7 @@
<stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
<boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
+ </ConfigTestElement>
<hashTree/>
<TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
<stringProp name="TCPSampler.server"></stringProp>
Modified: jmeter/trunk/bin/testfiles/SavedGenTest27.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SavedGenTest27.jmx?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SavedGenTest27.jmx (original)
+++ jmeter/trunk/bin/testfiles/SavedGenTest27.jmx Fri Feb 17 19:54:00 2017
@@ -729,7 +729,7 @@
<collectionProp name="SMTPSampler.headerFields"/>
</SmtpSampler>
<hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="SOAP/XML-RPC Request" enabled="true">
+ <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -739,7 +739,7 @@
<stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
<boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
+ </ConfigTestElement>
<hashTree/>
<TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
<stringProp name="TCPSampler.server"></stringProp>
Modified: jmeter/trunk/bin/testfiles/SavedGenTest2_13.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SavedGenTest2_13.jmx?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SavedGenTest2_13.jmx (original)
+++ jmeter/trunk/bin/testfiles/SavedGenTest2_13.jmx Fri Feb 17 19:54:00 2017
@@ -771,7 +771,7 @@
<collectionProp name="SMTPSampler.headerFields"/>
</SmtpSampler>
<hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="SOAP/XML-RPC Request" enabled="true">
+ <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -781,7 +781,7 @@
<stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
<boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
+ </ConfigTestElement>
<hashTree/>
<TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
<stringProp name="TCPSampler.server"></stringProp>
Modified: jmeter/trunk/bin/testfiles/SavedGenTest3_0.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SavedGenTest3_0.jmx?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SavedGenTest3_0.jmx (original)
+++ jmeter/trunk/bin/testfiles/SavedGenTest3_0.jmx Fri Feb 17 19:54:00 2017
@@ -750,7 +750,7 @@
<collectionProp name="SMTPSampler.headerFields"/>
</SmtpSampler>
<hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="SOAP/XML-RPC Request" enabled="true">
+ <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -760,7 +760,7 @@
<stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
<boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
+ </ConfigTestElement>
<hashTree/>
<TCPSampler guiclass="TCPSamplerGui" testclass="TCPSampler" testname="TCP Sampler" enabled="true">
<stringProp name="TCPSampler.server"></stringProp>
Modified: jmeter/trunk/bin/testfiles/SavedGuiTest.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SavedGuiTest.jmx?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SavedGuiTest.jmx (original)
+++ jmeter/trunk/bin/testfiles/SavedGuiTest.jmx Fri Feb 17 19:54:00 2017
@@ -556,7 +556,7 @@
<stringProp name="HTTPSampler.implementation">Java</stringProp>
</HTTPSamplerProxy>
<hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="SOAP Sampler" enabled="true">
+ <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP Sampler" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -568,7 +568,7 @@
<stringProp name="HTTPSampler.domain"></stringProp>
<stringProp name="HTTPSamper.xml_data"></stringProp>
<stringProp name="SoapSampler.URL_DATA"></stringProp>
- </SoapSampler>
+ </ConfigTestElement>
<hashTree/>
<AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Tomcat Access Log Sampler" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
Modified: jmeter/trunk/bin/testfiles/SavedGuiTest231.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SavedGuiTest231.jmx?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SavedGuiTest231.jmx (original)
+++ jmeter/trunk/bin/testfiles/SavedGuiTest231.jmx Fri Feb 17 19:54:00 2017
@@ -463,7 +463,7 @@
<stringProp name="HTTPSampler.implementation">HttpClient3.1</stringProp>
</HTTPSamplerProxy>
<hashTree/>
- <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="SOAP/XML-RPC Request" enabled="true">
+ <ConfigTestElement guiclass="ObsoleteGui" testclass="ConfigTestElement" testname="SOAP/XML-RPC Request" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -473,7 +473,7 @@
<stringProp name="SoapSampler.SOAP_ACTION">Action</stringProp>
<stringProp name="SoapSampler.SEND_SOAP_ACTION">true</stringProp>
<boolProp name="HTTPSampler.use_keepalive">false</boolProp>
- </SoapSampler>
+ </ConfigTestElement>
<hashTree/>
<AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java?rev=1783456&r1=1783455&r2=1783456&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java Fri Feb 17 19:54:00 2017
@@ -37,7 +37,6 @@ import java.util.List;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
-import org.junit.Ignore;
import org.junit.Test;
public class TestSaveService extends JMeterTestCase {
@@ -94,7 +93,7 @@ public class TestSaveService extends JMe
assertEquals("Property File Version mismatch, ensure you update SaveService#FILEVERSION field with sha1 of saveservice.properties without newline", SaveService.FILEVERSION, SaveService.getFileVersion());
}
- @Ignore @Test
+ @Test
public void testLoadAndSave() throws Exception {
boolean failed = false; // Did a test fail?
@@ -128,7 +127,7 @@ public class TestSaveService extends JMe
} finally {
out.close(); // Make sure all the data is flushed out
}
-
+
final FileStats compareStats = savedStats == FileStats.NO_STATS ? origStats : savedStats;
final FileStats outputStats;