Author: sebb
Date: Fri Sep 21 17:52:24 2007
New Revision: 578339
URL: http://svn.apache.org/viewvc?rev=578339&view=rev
Log:
Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from XML files
too
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=578339&r1=578338&r2=578339&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Fri Sep 21 17:52:24 2007
@@ -78,6 +78,7 @@
private static final String ATT_RESPONSE_CODE_OLD = "rs"; //$NON-NLS-1$
private static final String ATT_SUCCESS = "s"; //$NON-NLS-1$
+ private static final String ATT_SAMPLE_COUNT = "sc"; //$NON-NLS-1$
private static final String ATT_TIME = "t"; //$NON-NLS-1$
private static final String ATT_TIME_STAMP = "ts"; //$NON-NLS-1$
private static final String ATT_THREADNAME = "tn"; //$NON-NLS-1$
@@ -248,6 +249,9 @@
writer.addAttribute(ATT_DATA_ENCODING,
ConversionHelp.encode(res.getDataEncoding()));
if (save.saveBytes())
writer.addAttribute(ATT_BYTES,
String.valueOf(res.getBytes()));
+ if (save.saveSampleCount()){
+ writer.addAttribute(ATT_SAMPLE_COUNT,
String.valueOf(res.getSampleCount()));
+ }
if (save.saveThreadCounts()){// These cannot be restored
org.apache.jmeter.threads.ThreadGroup
threadGroup=JMeterContextService.getContext().getThreadGroup();
@@ -357,6 +361,7 @@
Converter.getLong(reader.getAttribute(ATT_TIME)));
res.setLatency(Converter.getLong(reader.getAttribute(ATT_LATENCY)));
res.setBytes(Converter.getInt(reader.getAttribute(ATT_BYTES)));
+
res.setSampleCount(Converter.getInt(reader.getAttribute(ATT_SAMPLE_COUNT),1));
// default is 1
// ATT_GRP_THRDS and ATT_ALL_THRDS are write only
}
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=578339&r1=578338&r2=578339&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Fri Sep 21 17:52:24 2007
@@ -40,7 +40,7 @@
<li>Fixup broken jmeter-server script</li>
<li>Bug 43364 - option to revert If Controller to pre 2.3RC3 behaviour</li>
<li>Bug 43449 - Statistical Remote mode does not handle Latency</li>
-<li>Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from CSV
files</li>
+<li>Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from
files</li>
</ul>
<h4>Improvements</h4>
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=578339&r1=578338&r2=578339&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Fri Sep 21 17:52:24 2007
@@ -77,6 +77,7 @@
private static final String ATT_RESPONSE_CODE_OLD = "rs"; //$NON-NLS-1$
private static final String ATT_SUCCESS = "s"; //$NON-NLS-1$
+ private static final String ATT_SAMPLE_COUNT = "sc"; //$NON-NLS-1$
private static final String ATT_TIME = "t"; //$NON-NLS-1$
private static final String ATT_TIME_STAMP = "ts"; //$NON-NLS-1$
private static final String ATT_THREADNAME = "tn"; //$NON-NLS-1$
@@ -247,6 +248,9 @@
writer.addAttribute(ATT_DATA_ENCODING,
ConversionHelp.encode(res.getDataEncoding()));
if (save.saveBytes())
writer.addAttribute(ATT_BYTES,
String.valueOf(res.getBytes()));
+ if (save.saveSampleCount()){
+ writer.addAttribute(ATT_SAMPLE_COUNT,
String.valueOf(res.getSampleCount()));
+ }
if (save.saveThreadCounts()){
writer.addAttribute(ATT_GRP_THRDS,
String.valueOf(res.getGroupThreads()));
writer.addAttribute(ATT_ALL_THRDS,
String.valueOf(res.getAllThreads()));
@@ -348,6 +352,7 @@
Converter.getLong(reader.getAttribute(ATT_TIME)));
res.setLatency(Converter.getLong(reader.getAttribute(ATT_LATENCY)));
res.setBytes(Converter.getInt(reader.getAttribute(ATT_BYTES)));
+
res.setSampleCount(Converter.getInt(reader.getAttribute(ATT_SAMPLE_COUNT),1));
// default is 1
res.setGroupThreads(Converter.getInt(reader.getAttribute(ATT_GRP_THRDS)));
res.setAllThreads(Converter.getInt(reader.getAttribute(ATT_ALL_THRDS)));
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=578339&r1=578338&r2=578339&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Sep 21 17:52:24 2007
@@ -58,7 +58,7 @@
<li>Fixup broken jmeter-server script</li>
<li>Bug 43364 - option to revert If Controller to pre 2.3RC3 behaviour</li>
<li>Bug 43449 - Statistical Remote mode does not handle Latency</li>
-<li>Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from CSV
files</li>
+<li>Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from
files</li>
</ul>
<h4>Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
