Author: sebb
Date: Thu Jan 12 16:39:35 2006
New Revision: 368532
URL: http://svn.apache.org/viewcvs?rev=368532&view=rev
Log:
Move test code to test tree
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
(with props)
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleResult.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleResult.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=368532&r1=368531&r2=368532&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleResult.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleResult.java
Thu Jan 12 16:39:35 2006
@@ -18,7 +18,6 @@
package org.apache.jmeter.samplers;
import java.io.Serializable;
-import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -27,17 +26,11 @@
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.LogTarget;
import org.apache.log.Logger;
-import org.apache.log.format.Formatter;
-import org.apache.log.format.RawFormatter;
-import org.apache.log.output.io.WriterTarget;
/**
* This is a nice packaging for the various information returned from taking a
@@ -46,7 +39,8 @@
*/
public class SampleResult implements Serializable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ // Needs to be accessible from Test code
+ static final Logger log = LoggingManager.getLoggerForClass();
// Bug 33196 - encoding ISO-8859-1 is only suitable for Western
countries
// However the suggested System.getProperty("file.encoding") is Cp1252
on
@@ -151,8 +145,7 @@
private int bytes = 0;
- // TODO do contentType and/or dataEncoding belong in HTTPSampleResult
- // instead?
+ // TODO do contentType and/or dataEncoding belong in HTTPSampleResult
instead?
private final static String TOTAL_TIME = "totalTime"; // $NON-NLS-1$
@@ -810,61 +803,4 @@
public void setParent(SampleResult parent) {
this.parent = parent;
}
- // TODO need more tests - particularly for the new functions
-
- public static class Test extends TestCase {
- public Test(String name) {
- super(name);
- }
-
- public void testElapsed() throws Exception {
- SampleResult res = new SampleResult();
-
- // Check sample increments OK
- res.sampleStart();
- Thread.sleep(100);
- res.sampleEnd();
- assertTrue(res.getTime() >= 100);
- }
-
- public void testPause() throws Exception {
- SampleResult res = new SampleResult();
- // Check sample increments OK
- res.sampleStart();
- Thread.sleep(100);
- res.samplePause();
-
- Thread.sleep(200);
-
- // Re-increment
- res.sampleResume();
- Thread.sleep(100);
- res.sampleEnd();
- long sampleTime = res.getTime();
- if ((sampleTime < 200) || (sampleTime > 290)) {
- fail("Accumulated time (" + sampleTime + ") was not between
200 and 290 ms");
- }
- }
-
- private static Formatter fmt = new RawFormatter();
-
- private StringWriter wr = null;
-
- private void divertLog() {// N.B. This needs to divert the log for
SampleResult
- wr = new StringWriter(1000);
- LogTarget[] lt = { new WriterTarget(wr, fmt) };
- log.setLogTargets(lt);
- }
-
- public void testPause2() throws Exception {
- divertLog();
- SampleResult res = new SampleResult();
- res.sampleStart();
- res.samplePause();
- assertTrue(wr.toString().length() == 0);
- res.samplePause();
- assertFalse(wr.toString().length() == 0);
- }
- // TODO some more invalid sequence tests needed
- }
}
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java?rev=368532&view=auto
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
(added)
+++
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Thu Jan 12 16:39:35 2006
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.samplers;
+
+import java.io.StringWriter;
+
+import junit.framework.TestCase;
+
+import org.apache.log.LogTarget;
+import org.apache.log.format.Formatter;
+import org.apache.log.format.RawFormatter;
+import org.apache.log.output.io.WriterTarget;
+
+// TODO need more tests - particularly for the new functions
+
+public class TestSampleResult extends TestCase {
+ public TestSampleResult(String name) {
+ super(name);
+ }
+
+ public void testElapsed() throws Exception {
+ SampleResult res = new SampleResult();
+
+ // Check sample increments OK
+ res.sampleStart();
+ Thread.sleep(100);
+ res.sampleEnd();
+ assertTrue(res.getTime() >= 100);
+ }
+
+ public void testPause() throws Exception {
+ SampleResult res = new SampleResult();
+ // Check sample increments OK
+ res.sampleStart();
+ Thread.sleep(100);
+ res.samplePause();
+
+ Thread.sleep(200);
+
+ // Re-increment
+ res.sampleResume();
+ Thread.sleep(100);
+ res.sampleEnd();
+ long sampleTime = res.getTime();
+ if ((sampleTime < 200) || (sampleTime > 290)) {
+ fail("Accumulated time (" + sampleTime + ") was not between
200 and 290 ms");
+ }
+ }
+
+ private static Formatter fmt = new RawFormatter();
+
+ private StringWriter wr = null;
+
+ private void divertLog() {// N.B. This needs to divert the log for
SampleResult
+ wr = new StringWriter(1000);
+ LogTarget[] lt = { new WriterTarget(wr, fmt) };
+ SampleResult.log.setLogTargets(lt);
+ }
+
+ public void testPause2() throws Exception {
+ divertLog();
+ SampleResult res = new SampleResult();
+ res.sampleStart();
+ res.samplePause();
+ assertTrue(wr.toString().length() == 0);
+ res.samplePause();
+ assertFalse(wr.toString().length() == 0);
+ }
+ // TODO some more invalid sequence tests needed
+}
+
Propchange:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
Propchange:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/samplers/TestSampleResult.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
