sebb 2004/03/04 17:34:53
Modified: src/core/org/apache/jmeter/reporters ResultCollector.java
src/core/org/apache/jmeter/reporters/gui
ResultActionGui.java ResultSaverGui.java
SummariserGui.java
Log:
Replaced getStaticLabel() with getLabelResource()
Revision Changes Path
1.34 +40 -3
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ResultCollector.java 22 Feb 2004 01:50:32 -0000 1.33
+++ ResultCollector.java 5 Mar 2004 01:34:53 -0000 1.34
@@ -42,6 +42,7 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.util.NoThreadClone;
+import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.Remoteable;
import org.apache.jmeter.samplers.SampleEvent;
@@ -50,7 +51,6 @@
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jorphan.io.TextFile;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
import org.xml.sax.SAXException;
@@ -487,4 +487,41 @@
public void testIterationStart(LoopIterationEvent event)
{
}
+ public static class Test extends JMeterTestCase
+ {
+ public Test(String x)
+ {
+ super(x);
+ }
+ public void testSave() throws Exception
+ {
+// String msg="abcd Sammelantr�ge J�rg H�hle \374 \373 \372 \371";
+ String msg="xabcde \u0410 \043e 0xCD0x91 \315\221 u3c00 \u3c00 u0391
\u0391 u00f1 \u00f1 P 373 \373 372 \372 371 \371";
+ System.out.println(msg);
+
+ //String msg2 = new String(msg,"");
+ //JMeterProperties; "jmeter.save.saveservice.response_data=true";
+ enableFunctionalMode(true);
+ ResultCollector rc = new ResultCollector();
+ SampleResult sample = new SampleResult();
+ sample.setSamplerData(msg);
+ sample.setDataType(SampleResult.BINARY);
+ sample.setResponseData(msg.getBytes());
+ sample.setSampleLabel(msg);
+ String s = rc.getSerializedSampleResult(sample);
+ System.out.println("no enc"+s);
+ sample.setResponseData(msg.getBytes("Cp1252"));
+ sample.setSampleLabel(msg);
+ s = rc.getSerializedSampleResult(sample);
+ System.out.println("1252"+s);
+ sample.setResponseData(msg.getBytes("ISO-8859-1"));
+ sample.setSampleLabel(msg);
+ s = rc.getSerializedSampleResult(sample);
+ System.out.println("8859"+s);
+ sample.setResponseData(msg.getBytes("UTF-8"));
+ sample.setSampleLabel(msg);
+ s = rc.getSerializedSampleResult(sample);
+ System.out.println("UTF8"+s);
+ }
+ }
}
1.3 +4 -6
jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java
Index: ResultActionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResultActionGui.java 14 Feb 2004 03:34:29 -0000 1.2
+++ ResultActionGui.java 5 Mar 2004 01:34:53 -0000 1.3
@@ -27,12 +27,10 @@
import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
import org.apache.jmeter.testelement.OnErrorTestElement;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
/**
* Create a Result Action Test Element
*
- * @author sebb AT apache DOT org
* @version $Revision$ Last updated: $Date$
*/
public class ResultActionGui extends AbstractPostProcessorGui
@@ -49,9 +47,9 @@
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
*/
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("resultaction_title");
+ return "resultaction_title";
}
/**
1.4 +4 -5
jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java
Index: ResultSaverGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResultSaverGui.java 14 Feb 2004 03:34:29 -0000 1.3
+++ ResultSaverGui.java 5 Mar 2004 01:34:53 -0000 1.4
@@ -34,8 +34,7 @@
* Create a ResultSaver test element, which saves the sample information
* in set of files
*
- * @author sebb AT apache DOT org
- * @version $Revision$ Last updated: $date$
+ * @version $Revision$ Last updated: $Date$
*/
public class ResultSaverGui extends AbstractPostProcessorGui
{
@@ -51,9 +50,9 @@
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
*/
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("resultsaver_title");
+ return "resultsaver_title";
}
/**
1.3 +4 -9
jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
Index: SummariserGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SummariserGui.java 14 Feb 2004 03:34:29 -0000 1.2
+++ SummariserGui.java 5 Mar 2004 01:34:53 -0000 1.3
@@ -23,7 +23,6 @@
import org.apache.jmeter.reporters.Summariser;
import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
/**
* Create a summariser test element.
@@ -32,8 +31,7 @@
* This is not really a PostProcessor, but that seems to be the closest
* of the existing types.
*
- * @author sebb AT apache DOT org
- * @version $Revision$ Last updated: $date$
+ * @version $Revision$ Last updated: $Date$
*/
public class SummariserGui extends AbstractPostProcessorGui
{
@@ -44,12 +42,9 @@
init();
}
- /**
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
- */
- public String getStaticLabel()
+ public String getLabelResource()
{
- return JMeterUtils.getResString("summariser_title");
+ return "summariser_title";
}
public void configure(TestElement el)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
