jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From und...@apache.org
Subject svn commit: r1649800 - in /jmeter/trunk: bin/testfiles/ src/core/org/apache/jmeter/save/converters/
Date Tue, 06 Jan 2015 13:28:48 GMT
Author: undera
Date: Tue Jan  6 13:28:47 2015
New Revision: 1649800

URL: http://svn.apache.org/r1649800
Log:
48799 - Add connect time to output metrics
Revert JMX changes and modify SampleSaveConfigurationConverter appropriately

Modified:
    jmeter/trunk/bin/testfiles/AssertionTestPlan.jmx
    jmeter/trunk/bin/testfiles/AuthManagerTestPlan.jmx
    jmeter/trunk/bin/testfiles/GenTest210.jmx
    jmeter/trunk/bin/testfiles/GenTest27.jmx
    jmeter/trunk/bin/testfiles/GuiTest.jmx
    jmeter/trunk/bin/testfiles/GuiTest231.jmx
    jmeter/trunk/bin/testfiles/HeaderManagerTestPlan.jmx
    jmeter/trunk/bin/testfiles/InterleaveTestPlan.jmx
    jmeter/trunk/bin/testfiles/InterleaveTestPlan2.jmx
    jmeter/trunk/bin/testfiles/LoopTestPlan.jmx
    jmeter/trunk/bin/testfiles/OnceOnlyTestPlan.jmx
    jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java

Modified: jmeter/trunk/bin/testfiles/AssertionTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/AssertionTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/AssertionTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/AssertionTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -60,7 +60,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>
@@ -92,7 +91,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/AuthManagerTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/AuthManagerTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/AuthManagerTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/AuthManagerTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -106,7 +106,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/GenTest210.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GenTest210.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GenTest210.jmx (original)
+++ jmeter/trunk/bin/testfiles/GenTest210.jmx Tue Jan  6 13:28:47 2015
@@ -284,7 +284,6 @@
           <hashTree/>
           <MongoSourceElement guiclass="TestBeanGUI" testclass="MongoSourceElement" testname="MongoDB
Source Config" enabled="true">
             <boolProp name="autoConnectRetry">false</boolProp>
-            <intProp name="connectTimeout">0</intProp>
             <stringProp name="connection"></stringProp>
             <intProp name="connectionsPerHost">10</intProp>
             <boolProp name="continueOnInsertError">false</boolProp>
@@ -970,7 +969,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1003,7 +1001,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1036,7 +1033,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1083,7 +1079,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1116,7 +1111,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1151,7 +1145,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1192,7 +1185,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1234,7 +1226,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1267,7 +1258,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1308,7 +1298,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1341,7 +1330,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1374,7 +1362,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1407,7 +1394,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1440,7 +1426,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>

Modified: jmeter/trunk/bin/testfiles/GenTest27.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GenTest27.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GenTest27.jmx (original)
+++ jmeter/trunk/bin/testfiles/GenTest27.jmx Tue Jan  6 13:28:47 2015
@@ -942,7 +942,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -975,7 +974,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1008,7 +1006,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1055,7 +1052,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1088,7 +1084,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1123,7 +1118,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1163,7 +1157,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1205,7 +1198,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1246,7 +1238,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1279,7 +1270,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1312,7 +1302,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1345,7 +1334,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1378,7 +1366,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>

Modified: jmeter/trunk/bin/testfiles/GuiTest.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GuiTest.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GuiTest.jmx (original)
+++ jmeter/trunk/bin/testfiles/GuiTest.jmx Tue Jan  6 13:28:47 2015
@@ -189,7 +189,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -221,7 +220,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -253,7 +251,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -285,7 +282,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -317,7 +313,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -349,7 +344,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -381,7 +375,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>

Modified: jmeter/trunk/bin/testfiles/GuiTest231.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GuiTest231.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GuiTest231.jmx (original)
+++ jmeter/trunk/bin/testfiles/GuiTest231.jmx Tue Jan  6 13:28:47 2015
@@ -787,7 +787,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -826,7 +825,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -859,7 +857,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -892,7 +889,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -934,7 +930,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -967,7 +962,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1000,7 +994,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1033,7 +1026,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1066,7 +1058,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1099,7 +1090,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1132,7 +1122,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>
@@ -1165,7 +1154,6 @@
               <value class="SampleSaveConfiguration">
                 <time>true</time>
                 <latency>true</latency>
-                <connectTime>false</connectTime>
                 <timestamp>true</timestamp>
                 <success>true</success>
                 <label>true</label>

Modified: jmeter/trunk/bin/testfiles/HeaderManagerTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/HeaderManagerTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/HeaderManagerTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/HeaderManagerTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -59,7 +59,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/InterleaveTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/InterleaveTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/InterleaveTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/InterleaveTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -99,7 +99,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/InterleaveTestPlan2.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/InterleaveTestPlan2.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/InterleaveTestPlan2.jmx (original)
+++ jmeter/trunk/bin/testfiles/InterleaveTestPlan2.jmx Tue Jan  6 13:28:47 2015
@@ -126,7 +126,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/LoopTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/LoopTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/LoopTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/LoopTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -83,7 +83,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/OnceOnlyTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/OnceOnlyTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/OnceOnlyTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/OnceOnlyTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -80,7 +80,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx (original)
+++ jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx Tue Jan  6 13:28:47 2015
@@ -117,7 +117,6 @@
             <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
-              <connectTime>false</connectTime>
               <timestamp>true</timestamp>
               <success>true</success>
               <label>true</label>

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?rev=1649800&r1=1649799&r2=1649800&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Tue Jan  6 13:28:47 2015
@@ -61,6 +61,7 @@ public class SampleSaveConfigurationConv
     private static final String NODE_THREAD_COUNT = "threadCounts"; // $NON-NLS-1$
     private static final String NODE_SAMPLE_COUNT = "sampleCount"; // $NON-NLS-1$
     private static final String NODE_IDLE_TIME = "idleTime"; // $NON-NLS-1$
+    private static final String NODE_CONNECT_TIME = "connectTime"; // $NON-NLS-1$
 
     // Additional member names which are currently not written out
     private static final String NODE_DELIMITER = "delimiter"; // $NON-NLS-1$
@@ -88,6 +89,7 @@ public class SampleSaveConfigurationConv
             if (fieldName.equals(NODE_THREAD_COUNT)) { return false; }
             if (fieldName.equals(NODE_SAMPLE_COUNT)) { return false; }
             if (fieldName.equals(NODE_IDLE_TIME)) { return false; }
+            if (fieldName.equals(NODE_CONNECT_TIME)) { return false; }
 
             // These fields are not currently saved or restored
             if (fieldName.equals(NODE_DELIMITER)) { return false; }
@@ -131,6 +133,7 @@ public class SampleSaveConfigurationConv
         createNode(writer,prop.saveThreadCounts(),NODE_THREAD_COUNT);
         createNode(writer,prop.saveSampleCount(),NODE_SAMPLE_COUNT);
         createNode(writer,prop.saveIdleTime(),NODE_IDLE_TIME);
+        createNode(writer, prop.saveConnectTime(), NODE_CONNECT_TIME);
     }
 
     // Helper method to simplify marshall routine



Mime
View raw message