You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2009/05/10 20:17:01 UTC

svn commit: r773380 [1/2] - in /jakarta/jmeter/trunk/test/src/org/apache/jmeter: assertions/ config/ config/gui/ control/

Author: sebb
Date: Sun May 10 18:17:01 2009
New Revision: 773380

URL: http://svn.apache.org/viewvc?rev=773380&view=rev
Log:
Tab police

Modified:
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/MD5HexAssertionTest.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRunTime.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestThroughputController.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/MD5HexAssertionTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/MD5HexAssertionTest.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/MD5HexAssertionTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/MD5HexAssertionTest.java Sun May 10 18:17:01 2009
@@ -21,16 +21,16 @@
 import junit.framework.TestCase;
 public class MD5HexAssertionTest extends TestCase {
 
-	public MD5HexAssertionTest() {
-		super();
-	}
+    public MD5HexAssertionTest() {
+        super();
+    }
 
-	public MD5HexAssertionTest(String arg0) {
-		super(arg0);
-	}
+    public MD5HexAssertionTest(String arg0) {
+        super(arg0);
+    }
 
-	public void testMD5() throws Exception {
-		assertEquals("D41D8CD98F00B204E9800998ECF8427E", MD5HexAssertion.baMD5Hex(new byte[] {}).toUpperCase(java.util.Locale.ENGLISH));
-	}
+    public void testMD5() throws Exception {
+        assertEquals("D41D8CD98F00B204E9800998ECF8427E", MD5HexAssertion.baMD5Hex(new byte[] {}).toUpperCase(java.util.Locale.ENGLISH));
+    }
 
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java Sun May 10 18:17:01 2009
@@ -33,148 +33,148 @@
 
 public class XMLSchemaAssertionTest extends JMeterTestCase {
 
-	private XMLSchemaAssertion assertion;
+    private XMLSchemaAssertion assertion;
 
-	private SampleResult result;
+    private SampleResult result;
 
-	private JMeterVariables vars;
+    private JMeterVariables vars;
 
-	private JMeterContext jmctx;
+    private JMeterContext jmctx;
 
-	public XMLSchemaAssertionTest(String arg0) {
-		super(arg0);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		jmctx = JMeterContextService.getContext();
-		assertion = new XMLSchemaAssertion();
-		assertion.setThreadContext(jmctx);// This would be done by the run
-											// command
-		result = new SampleResult();
-		vars = new JMeterVariables();
-		jmctx.setVariables(vars);
-		jmctx.setPreviousResult(result);
-		// LoggingManager.setPriority("DEBUG","jmeter");
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	private ByteArrayOutputStream readBA(String name) throws IOException {
-		BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)));
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
-		int len = 0;
-		byte[] data = new byte[512];
-		while ((len = bis.read(data)) >= 0) {
-			baos.write(data, 0, len);
-		}
-		bis.close();
-		return baos;
-	}
-
-	private byte[] readFile(String name) throws IOException {
-		return readBA(name).toByteArray();
-	}
-
-	public void testAssertionOK() throws Exception {
-		result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
-		assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertFalse("Should not be a failure", res.isFailure());
-	}
-
-	public void testAssertionFail() throws Exception {
-		result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
-		assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertTrue(res.isError());
-		assertFalse(res.isFailure());
-	}
-
-	public void testAssertionBadXSDFile() throws Exception {
-		result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
-		assertion.setXsdFileName("xtestfiles/XMLSchema-fail.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertTrue(res.getFailureMessage().indexOf("Failed to read schema document") > 0);
-		assertTrue(res.isError());// TODO - should this be a failure?
-		assertFalse(res.isFailure());
-	}
-
-	public void testAssertionNoFile() throws Exception {
-		result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
-		assertion.setXsdFileName("");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertEquals(XMLSchemaAssertion.FILE_NAME_IS_REQUIRED, res.getFailureMessage());
-		assertFalse(res.isError());
-		assertTrue(res.isFailure());
-	}
-
-	public void testAssertionNoResult() throws Exception {
-		// result.setResponseData - not set
-		assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
-		assertFalse(res.isError());
-		assertTrue(res.isFailure());
-	}
-
-	public void testAssertionEmptyResult() throws Exception {
-		result.setResponseData("".getBytes());
-		assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
-		assertFalse(res.isError());
-		assertTrue(res.isFailure());
-	}
-
-	public void testAssertionBlankResult() throws Exception {
-		result.setResponseData(" ".getBytes());
-		assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
-		assertTrue(res.isError());
-		assertFalse(res.isFailure());
-	}
-
-	public void testXMLTrailingcontent() throws Exception {
-		ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
-		baos.write("extra".getBytes());
-		result.setResponseData(baos.toByteArray());
-		assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertTrue(res.getFailureMessage().indexOf("Content is not allowed in trailing section") > 0);
-		assertTrue(res.isError());
-		assertFalse(res.isFailure());
-	}
-
-	public void testXMLTrailingwhitespace() throws Exception {
-		ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
-		baos.write(" \t\n".getBytes());
-		result.setResponseData(baos.toByteArray());
-		assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
-		AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
-		testLog.debug("xisError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure " + res.getFailureMessage());
-		assertFalse(res.isError());
-		assertFalse(res.isFailure());
-	}
+    public XMLSchemaAssertionTest(String arg0) {
+        super(arg0);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        jmctx = JMeterContextService.getContext();
+        assertion = new XMLSchemaAssertion();
+        assertion.setThreadContext(jmctx);// This would be done by the run
+                                            // command
+        result = new SampleResult();
+        vars = new JMeterVariables();
+        jmctx.setVariables(vars);
+        jmctx.setPreviousResult(result);
+        // LoggingManager.setPriority("DEBUG","jmeter");
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    private ByteArrayOutputStream readBA(String name) throws IOException {
+        BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
+        int len = 0;
+        byte[] data = new byte[512];
+        while ((len = bis.read(data)) >= 0) {
+            baos.write(data, 0, len);
+        }
+        bis.close();
+        return baos;
+    }
+
+    private byte[] readFile(String name) throws IOException {
+        return readBA(name).toByteArray();
+    }
+
+    public void testAssertionOK() throws Exception {
+        result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
+        assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertFalse("Should not be a failure", res.isFailure());
+    }
+
+    public void testAssertionFail() throws Exception {
+        result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
+        assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertTrue(res.isError());
+        assertFalse(res.isFailure());
+    }
+
+    public void testAssertionBadXSDFile() throws Exception {
+        result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
+        assertion.setXsdFileName("xtestfiles/XMLSchema-fail.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertTrue(res.getFailureMessage().indexOf("Failed to read schema document") > 0);
+        assertTrue(res.isError());// TODO - should this be a failure?
+        assertFalse(res.isFailure());
+    }
+
+    public void testAssertionNoFile() throws Exception {
+        result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
+        assertion.setXsdFileName("");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertEquals(XMLSchemaAssertion.FILE_NAME_IS_REQUIRED, res.getFailureMessage());
+        assertFalse(res.isError());
+        assertTrue(res.isFailure());
+    }
+
+    public void testAssertionNoResult() throws Exception {
+        // result.setResponseData - not set
+        assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
+        assertFalse(res.isError());
+        assertTrue(res.isFailure());
+    }
+
+    public void testAssertionEmptyResult() throws Exception {
+        result.setResponseData("".getBytes());
+        assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
+        assertFalse(res.isError());
+        assertTrue(res.isFailure());
+    }
+
+    public void testAssertionBlankResult() throws Exception {
+        result.setResponseData(" ".getBytes());
+        assertion.setXsdFileName("testfiles/XMLSchema-fail.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
+        assertTrue(res.isError());
+        assertFalse(res.isFailure());
+    }
+
+    public void testXMLTrailingcontent() throws Exception {
+        ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
+        baos.write("extra".getBytes());
+        result.setResponseData(baos.toByteArray());
+        assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertTrue(res.getFailureMessage().indexOf("Content is not allowed in trailing section") > 0);
+        assertTrue(res.isError());
+        assertFalse(res.isFailure());
+    }
+
+    public void testXMLTrailingwhitespace() throws Exception {
+        ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
+        baos.write(" \t\n".getBytes());
+        result.setResponseData(baos.toByteArray());
+        assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
+        AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
+        testLog.debug("xisError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure " + res.getFailureMessage());
+        assertFalse(res.isError());
+        assertFalse(res.isFailure());
+    }
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java Sun May 10 18:17:01 2009
@@ -34,32 +34,32 @@
 public class XPathAssertionTest extends JMeterTestCase {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private XPathAssertion assertion;
+    private XPathAssertion assertion;
 
-	private SampleResult result;
+    private SampleResult result;
 
-	private JMeterVariables vars;
+    private JMeterVariables vars;
 
-	private JMeterContext jmctx;
+    private JMeterContext jmctx;
 
-	public XPathAssertionTest(String arg0) {
-		super(arg0);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		jmctx = JMeterContextService.getContext();
-		assertion = new XPathAssertion();
-		assertion.setThreadContext(jmctx);// This would be done by the run command
-		result = new SampleResult();
-		result.setResponseData(readFile("testfiles/XPathAssertionTest.xml"));
-		vars = new JMeterVariables();
-		jmctx.setVariables(vars);
-		jmctx.setPreviousResult(result);
-		//testLog.setPriority(org.apache.log.Priority.DEBUG);
-	}
+    public XPathAssertionTest(String arg0) {
+        super(arg0);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        jmctx = JMeterContextService.getContext();
+        assertion = new XPathAssertion();
+        assertion.setThreadContext(jmctx);// This would be done by the run command
+        result = new SampleResult();
+        result.setResponseData(readFile("testfiles/XPathAssertionTest.xml"));
+        vars = new JMeterVariables();
+        jmctx.setVariables(vars);
+        jmctx.setPreviousResult(result);
+        //testLog.setPriority(org.apache.log.Priority.DEBUG);
+    }
 
-	private void setAlternateResponseData(){
+    private void setAlternateResponseData(){
         String data = "<company-xmlext-query-ret>" + "<row>" + "<value field=\"RetCode\">LIS_OK</value>"
               + "<value field=\"RetCodeExtension\"></value>" + "<value field=\"alias\"></value>"
               + "<value field=\"positioncount\"></value>" + "<value field=\"invalidpincount\">0</value>"
@@ -70,133 +70,133 @@
         result.setResponseData(data.getBytes());
     }
 
-	private ByteArrayOutputStream readBA(String name) throws IOException {
-		BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)));
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
-		int len = 0;
-		byte[] data = new byte[512];
-		while ((len = bis.read(data)) >= 0) {
-			baos.write(data, 0, len);
-		}
-		bis.close();
-		return baos;
-	}
-
-	private byte[] readFile(String name) throws IOException {
-		return readBA(name).toByteArray();
-	}
-
-	public void testAssertionOK() throws Exception {
-		assertion.setXPathString("/");
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertFalse("Should not be a failure", res.isFailure());
-	}
-
-	public void testAssertionFail() throws Exception {
-		assertion.setXPathString("//x");
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionPath1() throws Exception {
-		assertion.setXPathString("//*[code=1]");
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertFalse("Should not be a failure",res.isFailure());
-	}
-
-	public void testAssertionPath2() throws Exception {
-		assertion.setXPathString("//*[code=2]"); // Not present
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionBool1() throws Exception {
-		assertion.setXPathString("count(//error)=2");
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertFalse("Should not be a failure",res.isFailure());
-	}
-
-	public void testAssertionBool2() throws Exception {
-		assertion.setXPathString("count(//*[code=1])=1");
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertFalse("Should not be a failure",res.isFailure());
-	}
-
-	public void testAssertionBool3() throws Exception {
-		assertion.setXPathString("count(//error)=1"); // wrong
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionBool4() throws Exception {
-		assertion.setXPathString("count(//*[code=2])=1"); //Wrong
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionNumber() throws Exception {
-		assertion.setXPathString("count(//error)");// not yet handled
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionNoResult() throws Exception {
-		// result.setResponseData - not set
-		result = new SampleResult();
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionEmptyResult() throws Exception {
-		result.setResponseData("".getBytes());
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
-		assertFalse("Should not be an error", res.isError());
-		assertTrue("Should be a failure",res.isFailure());
-	}
-
-	public void testAssertionBlankResult() throws Exception {
-		result.setResponseData(" ".getBytes());
-		AssertionResult res = assertion.getResult(result);
-		testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
-		testLog.debug("failure message: " + res.getFailureMessage());
-		assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
-		assertTrue("Should be an error",res.isError());
-		assertFalse("Should not be a failure", res.isFailure());
-	}
+    private ByteArrayOutputStream readBA(String name) throws IOException {
+        BufferedInputStream bis = new BufferedInputStream(new FileInputStream(findTestFile(name)));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
+        int len = 0;
+        byte[] data = new byte[512];
+        while ((len = bis.read(data)) >= 0) {
+            baos.write(data, 0, len);
+        }
+        bis.close();
+        return baos;
+    }
+
+    private byte[] readFile(String name) throws IOException {
+        return readBA(name).toByteArray();
+    }
+
+    public void testAssertionOK() throws Exception {
+        assertion.setXPathString("/");
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertFalse("Should not be a failure", res.isFailure());
+    }
+
+    public void testAssertionFail() throws Exception {
+        assertion.setXPathString("//x");
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionPath1() throws Exception {
+        assertion.setXPathString("//*[code=1]");
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertFalse("Should not be a failure",res.isFailure());
+    }
+
+    public void testAssertionPath2() throws Exception {
+        assertion.setXPathString("//*[code=2]"); // Not present
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionBool1() throws Exception {
+        assertion.setXPathString("count(//error)=2");
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertFalse("Should not be a failure",res.isFailure());
+    }
+
+    public void testAssertionBool2() throws Exception {
+        assertion.setXPathString("count(//*[code=1])=1");
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertFalse("Should not be a failure",res.isFailure());
+    }
+
+    public void testAssertionBool3() throws Exception {
+        assertion.setXPathString("count(//error)=1"); // wrong
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionBool4() throws Exception {
+        assertion.setXPathString("count(//*[code=2])=1"); //Wrong
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionNumber() throws Exception {
+        assertion.setXPathString("count(//error)");// not yet handled
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionNoResult() throws Exception {
+        // result.setResponseData - not set
+        result = new SampleResult();
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionEmptyResult() throws Exception {
+        result.setResponseData("".getBytes());
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertEquals(AssertionResult.RESPONSE_WAS_NULL, res.getFailureMessage());
+        assertFalse("Should not be an error", res.isError());
+        assertTrue("Should be a failure",res.isFailure());
+    }
+
+    public void testAssertionBlankResult() throws Exception {
+        result.setResponseData(" ".getBytes());
+        AssertionResult res = assertion.getResult(result);
+        testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
+        testLog.debug("failure message: " + res.getFailureMessage());
+        assertTrue(res.getFailureMessage().indexOf("Premature end of file") > 0);
+        assertTrue("Should be an error",res.isError());
+        assertFalse("Should not be a failure", res.isFailure());
+    }
 
     public void testNoTolerance() throws Exception {
         String data = "<html><head><title>testtitle</title></head>" + "<body>"

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java Sun May 10 18:17:01 2009
@@ -41,54 +41,54 @@
     }
 
     public void tearDown() throws IOException{
-    	FileServer.getFileServer().closeFiles();
+        FileServer.getFileServer().closeFiles();
     }
     
     public void testopen() throws Exception {
-		JMeterContext jmcx = JMeterContextService.getContext();
-		jmcx.setVariables(new JMeterVariables());
-		JMeterVariables threadVars = jmcx.getVariables();
-    	threadVars.put("b", "value");
-
-    	CSVDataSet csv = new CSVDataSet();
-    	csv.setFilename("No.such.filename");
-    	csv.setVariableNames("a,b,c");
-    	csv.setDelimiter(",");
-    	csv.iterationStart(null);
-		assertNull(threadVars.get("a"));
-		assertEquals("value",threadVars.get("b"));
-		assertNull(threadVars.get("c"));
-
-		csv = new CSVDataSet();
-    	csv.setFilename("testfiles/testempty.csv");
-    	csv.setVariableNames("a,b,c");
-    	csv.setDelimiter(",");
-    	
-    	csv.iterationStart(null);
-		assertEquals("",threadVars.get("a"));
-		assertEquals("b1",threadVars.get("b"));
-		assertEquals("c1",threadVars.get("c"));
-
-    	csv.iterationStart(null);
-		assertEquals("a2",threadVars.get("a"));
-		assertEquals("",threadVars.get("b"));
-		assertEquals("c2",threadVars.get("c"));
-
-		csv.iterationStart(null);
-		assertEquals("a3",threadVars.get("a"));
-		assertEquals("b3",threadVars.get("b"));
-		assertEquals("",threadVars.get("c"));
-
-
-		csv.iterationStart(null);
-		assertEquals("a4",threadVars.get("a"));
-		assertEquals("b4",threadVars.get("b"));
-		assertEquals("c4",threadVars.get("c"));
-    	
-    	csv.iterationStart(null); // Restart file
-		assertEquals("",threadVars.get("a"));
-		assertEquals("b1",threadVars.get("b"));
-		assertEquals("c1",threadVars.get("c"));
+        JMeterContext jmcx = JMeterContextService.getContext();
+        jmcx.setVariables(new JMeterVariables());
+        JMeterVariables threadVars = jmcx.getVariables();
+        threadVars.put("b", "value");
+
+        CSVDataSet csv = new CSVDataSet();
+        csv.setFilename("No.such.filename");
+        csv.setVariableNames("a,b,c");
+        csv.setDelimiter(",");
+        csv.iterationStart(null);
+        assertNull(threadVars.get("a"));
+        assertEquals("value",threadVars.get("b"));
+        assertNull(threadVars.get("c"));
+
+        csv = new CSVDataSet();
+        csv.setFilename("testfiles/testempty.csv");
+        csv.setVariableNames("a,b,c");
+        csv.setDelimiter(",");
+        
+        csv.iterationStart(null);
+        assertEquals("",threadVars.get("a"));
+        assertEquals("b1",threadVars.get("b"));
+        assertEquals("c1",threadVars.get("c"));
+
+        csv.iterationStart(null);
+        assertEquals("a2",threadVars.get("a"));
+        assertEquals("",threadVars.get("b"));
+        assertEquals("c2",threadVars.get("c"));
+
+        csv.iterationStart(null);
+        assertEquals("a3",threadVars.get("a"));
+        assertEquals("b3",threadVars.get("b"));
+        assertEquals("",threadVars.get("c"));
+
+
+        csv.iterationStart(null);
+        assertEquals("a4",threadVars.get("a"));
+        assertEquals("b4",threadVars.get("b"));
+        assertEquals("c4",threadVars.get("c"));
+        
+        csv.iterationStart(null); // Restart file
+        assertEquals("",threadVars.get("a"));
+        assertEquals("b1",threadVars.get("b"));
+        assertEquals("c1",threadVars.get("c"));
     }
 
     private CSVDataSet initCSV(){

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/gui/TestArgumentsPanel.java Sun May 10 18:17:01 2009
@@ -30,31 +30,31 @@
  * 
  */
 public class TestArgumentsPanel extends TestCase {
-		/**
-		 * Create a new test.
-		 * 
-		 * @param name
-		 *            the name of the test
-		 */
-		public TestArgumentsPanel(String name) {
-			super(name);
-		}
+        /**
+         * Create a new test.
+         * 
+         * @param name
+         *            the name of the test
+         */
+        public TestArgumentsPanel(String name) {
+            super(name);
+        }
 
-		/**
-		 * Test that adding an argument to the table results in an appropriate
-		 * TestElement being created.
-		 * 
-		 * @throws Exception
-		 *             if an exception occurred during the test
-		 */
-		public void testArgumentCreation() throws Exception {
-			ArgumentsPanel gui = new ArgumentsPanel();
-			gui.tableModel.addRow(new Argument());
-			gui.tableModel.setValueAt("howdy", 0, 0);
-			gui.tableModel.addRow(new Argument());
-			gui.tableModel.setValueAt("doody", 0, 1);
+        /**
+         * Test that adding an argument to the table results in an appropriate
+         * TestElement being created.
+         * 
+         * @throws Exception
+         *             if an exception occurred during the test
+         */
+        public void testArgumentCreation() throws Exception {
+            ArgumentsPanel gui = new ArgumentsPanel();
+            gui.tableModel.addRow(new Argument());
+            gui.tableModel.setValueAt("howdy", 0, 0);
+            gui.tableModel.addRow(new Argument());
+            gui.tableModel.setValueAt("doody", 0, 1);
 
-			assertEquals("=", ((Argument) ((Arguments) gui.createTestElement()).getArguments().get(0).getObjectValue())
-					.getMetaData());
-		}
+            assertEquals("=", ((Argument) ((Arguments) gui.createTestElement()).getArguments().get(0).getObjectValue())
+                    .getMetaData());
+        }
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java Sun May 10 18:17:01 2009
@@ -23,36 +23,36 @@
 import org.apache.jmeter.testelement.TestElement;
 
 public class TestGenericController extends JMeterTestCase {
-		public TestGenericController(String name) {
-			super(name);
-		}
+        public TestGenericController(String name) {
+            super(name);
+        }
 
-		public void testProcessing() throws Exception {
-			testLog.debug("Testing Generic Controller");
-			GenericController controller = new GenericController();
-			GenericController sub_1 = new GenericController();
-			sub_1.addTestElement(new TestSampler("one"));
-			sub_1.addTestElement(new TestSampler("two"));
-			controller.addTestElement(sub_1);
-			controller.addTestElement(new TestSampler("three"));
-			GenericController sub_2 = new GenericController();
-			GenericController sub_3 = new GenericController();
-			sub_2.addTestElement(new TestSampler("four"));
-			sub_3.addTestElement(new TestSampler("five"));
-			sub_3.addTestElement(new TestSampler("six"));
-			sub_2.addTestElement(sub_3);
-			sub_2.addTestElement(new TestSampler("seven"));
-			controller.addTestElement(sub_2);
-			String[] order = new String[] { "one", "two", "three", "four", "five", "six", "seven" };
-			int counter = 7;
-			controller.initialize();
-			for (int i = 0; i < 2; i++) {
-				assertEquals(7, counter);
-				counter = 0;
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals(order[counter++], sampler.getName());
-				}
-			}
-		}
+        public void testProcessing() throws Exception {
+            testLog.debug("Testing Generic Controller");
+            GenericController controller = new GenericController();
+            GenericController sub_1 = new GenericController();
+            sub_1.addTestElement(new TestSampler("one"));
+            sub_1.addTestElement(new TestSampler("two"));
+            controller.addTestElement(sub_1);
+            controller.addTestElement(new TestSampler("three"));
+            GenericController sub_2 = new GenericController();
+            GenericController sub_3 = new GenericController();
+            sub_2.addTestElement(new TestSampler("four"));
+            sub_3.addTestElement(new TestSampler("five"));
+            sub_3.addTestElement(new TestSampler("six"));
+            sub_2.addTestElement(sub_3);
+            sub_2.addTestElement(new TestSampler("seven"));
+            controller.addTestElement(sub_2);
+            String[] order = new String[] { "one", "two", "three", "four", "five", "six", "seven" };
+            int counter = 7;
+            controller.initialize();
+            for (int i = 0; i < 2; i++) {
+                assertEquals(7, counter);
+                counter = 0;
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals(order[counter++], sampler.getName());
+                }
+            }
+        }
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java Sun May 10 18:17:01 2009
@@ -22,53 +22,53 @@
 //import org.apache.jmeter.testelement.TestElement;
 
 public class TestIfController extends JMeterTestCase {
-		public TestIfController(String name) {
-			super(name);
-		}
+        public TestIfController(String name) {
+            super(name);
+        }
 
-		public void testProcessing() throws Exception {
+        public void testProcessing() throws Exception {
 
-			GenericController controller = new GenericController();
+            GenericController controller = new GenericController();
 
-			controller.addTestElement(new IfController("false==false"));
-			controller.addTestElement(new IfController(" \"a\".equals(\"a\")"));
-			controller.addTestElement(new IfController("2<100"));
+            controller.addTestElement(new IfController("false==false"));
+            controller.addTestElement(new IfController(" \"a\".equals(\"a\")"));
+            controller.addTestElement(new IfController("2<100"));
 
             //TODO enable some proper tests!!
             
-			/*
-			 * GenericController sub_1 = new GenericController();
-			 * sub_1.addTestElement(new IfController("3==3"));
-			 * controller.addTestElement(sub_1); controller.addTestElement(new
-			 * IfController("false==true"));
-			 */
-
-			/*
-			 * GenericController controller = new GenericController();
-			 * GenericController sub_1 = new GenericController();
-			 * sub_1.addTestElement(new IfController("10<100"));
-			 * sub_1.addTestElement(new IfController("true==false"));
-			 * controller.addTestElement(sub_1); controller.addTestElement(new
-			 * IfController("false==false"));
-			 * 
-			 * IfController sub_2 = new IfController(); sub_2.setCondition( "10<10000");
-			 * GenericController sub_3 = new GenericController();
-			 * 
-			 * sub_2.addTestElement(new IfController( " \"a\".equals(\"a\")" ) );
-			 * sub_3.addTestElement(new IfController("2>100"));
-			 * sub_3.addTestElement(new IfController("false==true"));
-			 * sub_2.addTestElement(sub_3); sub_2.addTestElement(new
-			 * IfController("2==3")); controller.addTestElement(sub_2);
-			 */
-
-			/*
-			 * IfController controller = new IfController("12==12");
-			 * controller.initialize();
-			 */
-//			TestElement sampler = null;
-//			while ((sampler = controller.next()) != null) {
-//				logger.debug("    ->>>  Gonna assertTrue :" + sampler.getClass().getName() + " Property is   ---->>>"
-//						+ sampler.getName());
-//			}
-		}
+            /*
+             * GenericController sub_1 = new GenericController();
+             * sub_1.addTestElement(new IfController("3==3"));
+             * controller.addTestElement(sub_1); controller.addTestElement(new
+             * IfController("false==true"));
+             */
+
+            /*
+             * GenericController controller = new GenericController();
+             * GenericController sub_1 = new GenericController();
+             * sub_1.addTestElement(new IfController("10<100"));
+             * sub_1.addTestElement(new IfController("true==false"));
+             * controller.addTestElement(sub_1); controller.addTestElement(new
+             * IfController("false==false"));
+             * 
+             * IfController sub_2 = new IfController(); sub_2.setCondition( "10<10000");
+             * GenericController sub_3 = new GenericController();
+             * 
+             * sub_2.addTestElement(new IfController( " \"a\".equals(\"a\")" ) );
+             * sub_3.addTestElement(new IfController("2>100"));
+             * sub_3.addTestElement(new IfController("false==true"));
+             * sub_2.addTestElement(sub_3); sub_2.addTestElement(new
+             * IfController("2==3")); controller.addTestElement(sub_2);
+             */
+
+            /*
+             * IfController controller = new IfController("12==12");
+             * controller.initialize();
+             */
+//          TestElement sampler = null;
+//          while ((sampler = controller.next()) != null) {
+//              logger.debug("    ->>>  Gonna assertTrue :" + sampler.getClass().getName() + " Property is   ---->>>"
+//                      + sampler.getName());
+//          }
+        }
 }
\ No newline at end of file

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java Sun May 10 18:17:01 2009
@@ -23,205 +23,205 @@
 import org.apache.jmeter.testelement.TestElement;
 
 public class TestInterleaveControl extends JMeterTestCase {
-		public TestInterleaveControl(String name) {
-			super(name);
-		}
-
-		public void testProcessing() throws Exception {
-			testLog.debug("Testing Interleave Controller 1");
-			GenericController controller = new GenericController();
-			InterleaveControl sub_1 = new InterleaveControl();
-			sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
-			sub_1.addTestElement(new TestSampler("one"));
-			sub_1.addTestElement(new TestSampler("two"));
-			controller.addTestElement(sub_1);
-			controller.addTestElement(new TestSampler("three"));
-			LoopController sub_2 = new LoopController();
-			sub_2.setLoops(3);
-			GenericController sub_3 = new GenericController();
-			sub_2.addTestElement(new TestSampler("four"));
-			sub_3.addTestElement(new TestSampler("five"));
-			sub_3.addTestElement(new TestSampler("six"));
-			sub_2.addTestElement(sub_3);
-			sub_2.addTestElement(new TestSampler("seven"));
-			controller.addTestElement(sub_2);
-			String[] interleaveOrder = new String[] { "one", "two" };
-			String[] order = new String[] { "dummy", "three", "four", "five", "six", "seven", "four", "five", "six",
-					"seven", "four", "five", "six", "seven" };
-			int counter = 14;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			sub_3.setRunningVersion(true);
-			controller.initialize();
-			for (int i = 0; i < 4; i++) {
-				assertEquals(14, counter);
-				counter = 0;
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					if (counter == 0) {
-						assertEquals(interleaveOrder[i % 2], sampler.getName());
-					} else {
-						assertEquals(order[counter], sampler.getName());
-					}
-					counter++;
-				}
-			}
-		}
-
-		public void testProcessing6() throws Exception {
-			testLog.debug("Testing Interleave Controller 6");
-			GenericController controller = new GenericController();
-			InterleaveControl sub_1 = new InterleaveControl();
-			controller.addTestElement(new TestSampler("one"));
-			sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
-			controller.addTestElement(sub_1);
-			LoopController sub_2 = new LoopController();
-			sub_1.addTestElement(sub_2);
-			sub_2.setLoops(3);
-			int counter = 1;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			controller.initialize();
-			for (int i = 0; i < 4; i++) {
-				assertEquals(1, counter);
-				counter = 0;
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals("one", sampler.getName());
-					counter++;
-				}
-			}
-		}
-
-		public void testProcessing2() throws Exception {
-			testLog.debug("Testing Interleave Controller 2");
-			GenericController controller = new GenericController();
-			InterleaveControl sub_1 = new InterleaveControl();
-			sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
-			sub_1.addTestElement(new TestSampler("one"));
-			sub_1.addTestElement(new TestSampler("two"));
-			controller.addTestElement(sub_1);
-			controller.addTestElement(new TestSampler("three"));
-			LoopController sub_2 = new LoopController();
-			sub_2.setLoops(3);
-			GenericController sub_3 = new GenericController();
-			sub_2.addTestElement(new TestSampler("four"));
-			sub_3.addTestElement(new TestSampler("five"));
-			sub_3.addTestElement(new TestSampler("six"));
-			sub_2.addTestElement(sub_3);
-			sub_2.addTestElement(new TestSampler("seven"));
-			sub_1.addTestElement(sub_2);
-			String[] order = new String[] { "one", "three", "two", "three", "four", "three", "one", "three", "two",
-					"three", "five", "three", "one", "three", "two", "three", "six", "three", "one", "three" };
-			int counter = 0;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			sub_3.setRunningVersion(true);
-			controller.initialize();
-			while (counter < order.length) {
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals("failed on " + counter, order[counter], sampler.getName());
-					counter++;
-				}
-			}
-		}
-
-		public void testProcessing3() throws Exception {
-			testLog.debug("Testing Interleave Controller 3");
-			GenericController controller = new GenericController();
-			InterleaveControl sub_1 = new InterleaveControl();
-			sub_1.setStyle(InterleaveControl.USE_SUB_CONTROLLERS);
-			sub_1.addTestElement(new TestSampler("one"));
-			sub_1.addTestElement(new TestSampler("two"));
-			controller.addTestElement(sub_1);
-			controller.addTestElement(new TestSampler("three"));
-			LoopController sub_2 = new LoopController();
-			sub_2.setLoops(3);
-			GenericController sub_3 = new GenericController();
-			sub_2.addTestElement(new TestSampler("four"));
-			sub_3.addTestElement(new TestSampler("five"));
-			sub_3.addTestElement(new TestSampler("six"));
-			sub_2.addTestElement(sub_3);
-			sub_2.addTestElement(new TestSampler("seven"));
-			sub_1.addTestElement(sub_2);
-			String[] order = new String[] { "one", "three", "two", "three", "four", "five", "six", "seven", "four",
-					"five", "six", "seven", "four", "five", "six", "seven", "three", "one", "three", "two", "three" };
-			int counter = 0;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			sub_3.setRunningVersion(true);
-			controller.initialize();
-			while (counter < order.length) {
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals("failed on" + counter, order[counter], sampler.getName());
-					counter++;
-				}
-			}
-		}
-
-		public void testProcessing4() throws Exception {
-			testLog.debug("Testing Interleave Controller 4");
-			GenericController controller = new GenericController();
-			InterleaveControl sub_1 = new InterleaveControl();
-			sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
-			controller.addTestElement(sub_1);
-			GenericController sub_2 = new GenericController();
-			sub_2.addTestElement(new TestSampler("one"));
-			sub_2.addTestElement(new TestSampler("two"));
-			sub_1.addTestElement(sub_2);
-			GenericController sub_3 = new GenericController();
-			sub_3.addTestElement(new TestSampler("three"));
-			sub_3.addTestElement(new TestSampler("four"));
-			sub_1.addTestElement(sub_3);
-			String[] order = new String[] { "one", "three", "two", "four" };
-			int counter = 0;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			sub_3.setRunningVersion(true);
-			controller.initialize();
-			while (counter < order.length) {
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals("failed on" + counter, order[counter], sampler.getName());
-					counter++;
-				}
-			}
-		}
-
-		public void testProcessing5() throws Exception {
-			testLog.debug("Testing Interleave Controller 5");
-			GenericController controller = new GenericController();
-			InterleaveControl sub_1 = new InterleaveControl();
-			sub_1.setStyle(InterleaveControl.USE_SUB_CONTROLLERS);
-			controller.addTestElement(sub_1);
-			GenericController sub_2 = new GenericController();
-			sub_2.addTestElement(new TestSampler("one"));
-			sub_2.addTestElement(new TestSampler("two"));
-			sub_1.addTestElement(sub_2);
-			GenericController sub_3 = new GenericController();
-			sub_3.addTestElement(new TestSampler("three"));
-			sub_3.addTestElement(new TestSampler("four"));
-			sub_1.addTestElement(sub_3);
-			String[] order = new String[] { "one", "two", "three", "four" };
-			int counter = 0;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			sub_3.setRunningVersion(true);
-			controller.initialize();
-			while (counter < order.length) {
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals("failed on" + counter, order[counter], sampler.getName());
-					counter++;
-				}
-			}
-		}
+        public TestInterleaveControl(String name) {
+            super(name);
+        }
+
+        public void testProcessing() throws Exception {
+            testLog.debug("Testing Interleave Controller 1");
+            GenericController controller = new GenericController();
+            InterleaveControl sub_1 = new InterleaveControl();
+            sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
+            sub_1.addTestElement(new TestSampler("one"));
+            sub_1.addTestElement(new TestSampler("two"));
+            controller.addTestElement(sub_1);
+            controller.addTestElement(new TestSampler("three"));
+            LoopController sub_2 = new LoopController();
+            sub_2.setLoops(3);
+            GenericController sub_3 = new GenericController();
+            sub_2.addTestElement(new TestSampler("four"));
+            sub_3.addTestElement(new TestSampler("five"));
+            sub_3.addTestElement(new TestSampler("six"));
+            sub_2.addTestElement(sub_3);
+            sub_2.addTestElement(new TestSampler("seven"));
+            controller.addTestElement(sub_2);
+            String[] interleaveOrder = new String[] { "one", "two" };
+            String[] order = new String[] { "dummy", "three", "four", "five", "six", "seven", "four", "five", "six",
+                    "seven", "four", "five", "six", "seven" };
+            int counter = 14;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            sub_3.setRunningVersion(true);
+            controller.initialize();
+            for (int i = 0; i < 4; i++) {
+                assertEquals(14, counter);
+                counter = 0;
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    if (counter == 0) {
+                        assertEquals(interleaveOrder[i % 2], sampler.getName());
+                    } else {
+                        assertEquals(order[counter], sampler.getName());
+                    }
+                    counter++;
+                }
+            }
+        }
+
+        public void testProcessing6() throws Exception {
+            testLog.debug("Testing Interleave Controller 6");
+            GenericController controller = new GenericController();
+            InterleaveControl sub_1 = new InterleaveControl();
+            controller.addTestElement(new TestSampler("one"));
+            sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
+            controller.addTestElement(sub_1);
+            LoopController sub_2 = new LoopController();
+            sub_1.addTestElement(sub_2);
+            sub_2.setLoops(3);
+            int counter = 1;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            controller.initialize();
+            for (int i = 0; i < 4; i++) {
+                assertEquals(1, counter);
+                counter = 0;
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals("one", sampler.getName());
+                    counter++;
+                }
+            }
+        }
+
+        public void testProcessing2() throws Exception {
+            testLog.debug("Testing Interleave Controller 2");
+            GenericController controller = new GenericController();
+            InterleaveControl sub_1 = new InterleaveControl();
+            sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
+            sub_1.addTestElement(new TestSampler("one"));
+            sub_1.addTestElement(new TestSampler("two"));
+            controller.addTestElement(sub_1);
+            controller.addTestElement(new TestSampler("three"));
+            LoopController sub_2 = new LoopController();
+            sub_2.setLoops(3);
+            GenericController sub_3 = new GenericController();
+            sub_2.addTestElement(new TestSampler("four"));
+            sub_3.addTestElement(new TestSampler("five"));
+            sub_3.addTestElement(new TestSampler("six"));
+            sub_2.addTestElement(sub_3);
+            sub_2.addTestElement(new TestSampler("seven"));
+            sub_1.addTestElement(sub_2);
+            String[] order = new String[] { "one", "three", "two", "three", "four", "three", "one", "three", "two",
+                    "three", "five", "three", "one", "three", "two", "three", "six", "three", "one", "three" };
+            int counter = 0;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            sub_3.setRunningVersion(true);
+            controller.initialize();
+            while (counter < order.length) {
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals("failed on " + counter, order[counter], sampler.getName());
+                    counter++;
+                }
+            }
+        }
+
+        public void testProcessing3() throws Exception {
+            testLog.debug("Testing Interleave Controller 3");
+            GenericController controller = new GenericController();
+            InterleaveControl sub_1 = new InterleaveControl();
+            sub_1.setStyle(InterleaveControl.USE_SUB_CONTROLLERS);
+            sub_1.addTestElement(new TestSampler("one"));
+            sub_1.addTestElement(new TestSampler("two"));
+            controller.addTestElement(sub_1);
+            controller.addTestElement(new TestSampler("three"));
+            LoopController sub_2 = new LoopController();
+            sub_2.setLoops(3);
+            GenericController sub_3 = new GenericController();
+            sub_2.addTestElement(new TestSampler("four"));
+            sub_3.addTestElement(new TestSampler("five"));
+            sub_3.addTestElement(new TestSampler("six"));
+            sub_2.addTestElement(sub_3);
+            sub_2.addTestElement(new TestSampler("seven"));
+            sub_1.addTestElement(sub_2);
+            String[] order = new String[] { "one", "three", "two", "three", "four", "five", "six", "seven", "four",
+                    "five", "six", "seven", "four", "five", "six", "seven", "three", "one", "three", "two", "three" };
+            int counter = 0;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            sub_3.setRunningVersion(true);
+            controller.initialize();
+            while (counter < order.length) {
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals("failed on" + counter, order[counter], sampler.getName());
+                    counter++;
+                }
+            }
+        }
+
+        public void testProcessing4() throws Exception {
+            testLog.debug("Testing Interleave Controller 4");
+            GenericController controller = new GenericController();
+            InterleaveControl sub_1 = new InterleaveControl();
+            sub_1.setStyle(InterleaveControl.IGNORE_SUB_CONTROLLERS);
+            controller.addTestElement(sub_1);
+            GenericController sub_2 = new GenericController();
+            sub_2.addTestElement(new TestSampler("one"));
+            sub_2.addTestElement(new TestSampler("two"));
+            sub_1.addTestElement(sub_2);
+            GenericController sub_3 = new GenericController();
+            sub_3.addTestElement(new TestSampler("three"));
+            sub_3.addTestElement(new TestSampler("four"));
+            sub_1.addTestElement(sub_3);
+            String[] order = new String[] { "one", "three", "two", "four" };
+            int counter = 0;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            sub_3.setRunningVersion(true);
+            controller.initialize();
+            while (counter < order.length) {
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals("failed on" + counter, order[counter], sampler.getName());
+                    counter++;
+                }
+            }
+        }
+
+        public void testProcessing5() throws Exception {
+            testLog.debug("Testing Interleave Controller 5");
+            GenericController controller = new GenericController();
+            InterleaveControl sub_1 = new InterleaveControl();
+            sub_1.setStyle(InterleaveControl.USE_SUB_CONTROLLERS);
+            controller.addTestElement(sub_1);
+            GenericController sub_2 = new GenericController();
+            sub_2.addTestElement(new TestSampler("one"));
+            sub_2.addTestElement(new TestSampler("two"));
+            sub_1.addTestElement(sub_2);
+            GenericController sub_3 = new GenericController();
+            sub_3.addTestElement(new TestSampler("three"));
+            sub_3.addTestElement(new TestSampler("four"));
+            sub_1.addTestElement(sub_3);
+            String[] order = new String[] { "one", "two", "three", "four" };
+            int counter = 0;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            sub_3.setRunningVersion(true);
+            controller.initialize();
+            while (counter < order.length) {
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals("failed on" + counter, order[counter], sampler.getName());
+                    counter++;
+                }
+            }
+        }
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java Sun May 10 18:17:01 2009
@@ -23,60 +23,60 @@
 import org.apache.jmeter.testelement.TestElement;
 
 public class TestLoopController extends JMeterTestCase {
-		public TestLoopController(String name) {
-			super(name);
-		}
+        public TestLoopController(String name) {
+            super(name);
+        }
 
-		public void testProcessing() throws Exception {
-			GenericController controller = new GenericController();
-			GenericController sub_1 = new GenericController();
-			sub_1.addTestElement(new TestSampler("one"));
-			sub_1.addTestElement(new TestSampler("two"));
-			controller.addTestElement(sub_1);
-			controller.addTestElement(new TestSampler("three"));
-			LoopController sub_2 = new LoopController();
-			sub_2.setLoops(3);
-			GenericController sub_3 = new GenericController();
-			sub_2.addTestElement(new TestSampler("four"));
-			sub_3.addTestElement(new TestSampler("five"));
-			sub_3.addTestElement(new TestSampler("six"));
-			sub_2.addTestElement(sub_3);
-			sub_2.addTestElement(new TestSampler("seven"));
-			controller.addTestElement(sub_2);
-			String[] order = new String[] { "one", "two", "three", "four", "five", "six", "seven", "four", "five",
-					"six", "seven", "four", "five", "six", "seven" };
-			int counter = 15;
-			controller.setRunningVersion(true);
-			sub_1.setRunningVersion(true);
-			sub_2.setRunningVersion(true);
-			sub_3.setRunningVersion(true);
-			controller.initialize();
-			for (int i = 0; i < 2; i++) {
-				assertEquals(15, counter);
-				counter = 0;
-				TestElement sampler = null;
-				while ((sampler = controller.next()) != null) {
-					assertEquals(order[counter++], sampler.getName());
-				}
-			}
-		}
+        public void testProcessing() throws Exception {
+            GenericController controller = new GenericController();
+            GenericController sub_1 = new GenericController();
+            sub_1.addTestElement(new TestSampler("one"));
+            sub_1.addTestElement(new TestSampler("two"));
+            controller.addTestElement(sub_1);
+            controller.addTestElement(new TestSampler("three"));
+            LoopController sub_2 = new LoopController();
+            sub_2.setLoops(3);
+            GenericController sub_3 = new GenericController();
+            sub_2.addTestElement(new TestSampler("four"));
+            sub_3.addTestElement(new TestSampler("five"));
+            sub_3.addTestElement(new TestSampler("six"));
+            sub_2.addTestElement(sub_3);
+            sub_2.addTestElement(new TestSampler("seven"));
+            controller.addTestElement(sub_2);
+            String[] order = new String[] { "one", "two", "three", "four", "five", "six", "seven", "four", "five",
+                    "six", "seven", "four", "five", "six", "seven" };
+            int counter = 15;
+            controller.setRunningVersion(true);
+            sub_1.setRunningVersion(true);
+            sub_2.setRunningVersion(true);
+            sub_3.setRunningVersion(true);
+            controller.initialize();
+            for (int i = 0; i < 2; i++) {
+                assertEquals(15, counter);
+                counter = 0;
+                TestElement sampler = null;
+                while ((sampler = controller.next()) != null) {
+                    assertEquals(order[counter++], sampler.getName());
+                }
+            }
+        }
 
-		public void testLoopZeroTimes() throws Exception {
-			LoopController loop = new LoopController();
-			loop.setLoops(0);
-			loop.addTestElement(new TestSampler("never run"));
-			loop.initialize();
-			assertNull(loop.next());
-		}
+        public void testLoopZeroTimes() throws Exception {
+            LoopController loop = new LoopController();
+            loop.setLoops(0);
+            loop.addTestElement(new TestSampler("never run"));
+            loop.initialize();
+            assertNull(loop.next());
+        }
 
-		public void testInfiniteLoop() throws Exception {
-			LoopController loop = new LoopController();
-			loop.setLoops(-1);
-			loop.addTestElement(new TestSampler("never run"));
-			loop.setRunningVersion(true);
-			loop.initialize();
-			for (int i = 0; i < 42; i++) {
-				assertNotNull(loop.next());
-			}
-		}
+        public void testInfiniteLoop() throws Exception {
+            LoopController loop = new LoopController();
+            loop.setLoops(-1);
+            loop.addTestElement(new TestSampler("never run"));
+            loop.setRunningVersion(true);
+            loop.initialize();
+            for (int i = 0; i < 42; i++) {
+                assertNotNull(loop.next());
+            }
+        }
 }
\ No newline at end of file

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java Sun May 10 18:17:01 2009
@@ -25,49 +25,49 @@
 
 public class TestRandomOrderController extends JMeterTestCase {
 
-		public TestRandomOrderController(String name) {
-			super(name);
-		}
+        public TestRandomOrderController(String name) {
+            super(name);
+        }
 
-		public void testRandomOrder() {
-			testLog.debug("Testing RandomOrderController");
-			RandomOrderController roc = new RandomOrderController();
-			roc.addTestElement(new TestSampler("zero"));
-			roc.addTestElement(new TestSampler("one"));
-			roc.addTestElement(new TestSampler("two"));
-			roc.addTestElement(new TestSampler("three"));
-			TestElement sampler = null;
-			List usedSamplers = new ArrayList();
-			roc.initialize();
-			while ((sampler = roc.next()) != null) {
-				String samplerName = sampler.getName();
-				if (usedSamplers.contains(samplerName)) {
-					assertTrue("Duplicate sampler returned from next()", false);
-				}
-				usedSamplers.add(samplerName);
-			}
-			assertTrue("All samplers were returned", usedSamplers.size() == 4);
-		}
+        public void testRandomOrder() {
+            testLog.debug("Testing RandomOrderController");
+            RandomOrderController roc = new RandomOrderController();
+            roc.addTestElement(new TestSampler("zero"));
+            roc.addTestElement(new TestSampler("one"));
+            roc.addTestElement(new TestSampler("two"));
+            roc.addTestElement(new TestSampler("three"));
+            TestElement sampler = null;
+            List usedSamplers = new ArrayList();
+            roc.initialize();
+            while ((sampler = roc.next()) != null) {
+                String samplerName = sampler.getName();
+                if (usedSamplers.contains(samplerName)) {
+                    assertTrue("Duplicate sampler returned from next()", false);
+                }
+                usedSamplers.add(samplerName);
+            }
+            assertTrue("All samplers were returned", usedSamplers.size() == 4);
+        }
 
-		public void testRandomOrderNoElements() {
-			RandomOrderController roc = new RandomOrderController();
-			roc.initialize();
-			assertTrue(roc.next() == null);
-		}
+        public void testRandomOrderNoElements() {
+            RandomOrderController roc = new RandomOrderController();
+            roc.initialize();
+            assertTrue(roc.next() == null);
+        }
 
-		public void testRandomOrderOneElement() {
-			RandomOrderController roc = new RandomOrderController();
-			roc.addTestElement(new TestSampler("zero"));
-			TestElement sampler = null;
-			List usedSamplers = new ArrayList();
-			roc.initialize();
-			while ((sampler = roc.next()) != null) {
-				String samplerName = sampler.getName();
-				if (usedSamplers.contains(samplerName)) {
-					assertTrue("Duplicate sampler returned from next()", false);
-				}
-				usedSamplers.add(samplerName);
-			}
-			assertTrue("All samplers were returned", usedSamplers.size() == 1);
-		}
+        public void testRandomOrderOneElement() {
+            RandomOrderController roc = new RandomOrderController();
+            roc.addTestElement(new TestSampler("zero"));
+            TestElement sampler = null;
+            List usedSamplers = new ArrayList();
+            roc.initialize();
+            while ((sampler = roc.next()) != null) {
+                String samplerName = sampler.getName();
+                if (usedSamplers.contains(samplerName)) {
+                    assertTrue("Duplicate sampler returned from next()", false);
+                }
+                usedSamplers.add(samplerName);
+            }
+            assertTrue("All samplers were returned", usedSamplers.size() == 1);
+        }
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRunTime.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRunTime.java?rev=773380&r1=773379&r2=773380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRunTime.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRunTime.java Sun May 10 18:17:01 2009
@@ -26,45 +26,45 @@
  * @version $Revision$
  */
 public class TestRunTime extends JMeterTestCase {
-		public TestRunTime(String name) {
-			super(name);
-		}
+        public TestRunTime(String name) {
+            super(name);
+        }
 
-		public void testProcessing() throws Exception {
+        public void testProcessing() throws Exception {
 
-			RunTime controller = new RunTime();
-			controller.setRuntime(10);
-			TestSampler samp1 = new TestSampler("Sample 1", 500);
-			TestSampler samp2 = new TestSampler("Sample 2", 490);
+            RunTime controller = new RunTime();
+            controller.setRuntime(10);
+            TestSampler samp1 = new TestSampler("Sample 1", 500);
+            TestSampler samp2 = new TestSampler("Sample 2", 490);
 
-			LoopController sub1 = new LoopController();
-			sub1.setLoops(2);
-			sub1.setContinueForever(false);
-			sub1.addTestElement(samp1);
+            LoopController sub1 = new LoopController();
+            sub1.setLoops(2);
+            sub1.setContinueForever(false);
+            sub1.addTestElement(samp1);
 
-			LoopController sub2 = new LoopController();
-			sub2.setLoops(40);
-			sub2.setContinueForever(false);
-			sub2.addTestElement(samp2);
-			controller.addTestElement(sub1);
-			controller.addTestElement(sub2);
-			controller.setRunningVersion(true);
-			sub1.setRunningVersion(true);
-			sub2.setRunningVersion(true);
-			controller.initialize();
-			Sampler sampler = null;
-			int loops = 0;
-			long now = System.currentTimeMillis();
-			while ((sampler = controller.next()) != null) {
-				loops++;
-				sampler.sample(null);
-			}
-			long elapsed = System.currentTimeMillis() - now;
-			assertTrue("Should be at least 20 loops "+loops, loops >= 20);
-			assertTrue("Should be fewer than 30 loops "+loops, loops < 30);
-			assertTrue("Should take at least 10 seconds "+elapsed, elapsed >= 10000);
-			assertTrue("Should take less than 12 seconds "+elapsed, elapsed <= 12000);
-			assertEquals("Sampler 1 should run 2 times", 2, samp1.getSamples());
-			assertTrue("Sampler 2 should run >= 18 times", samp2.getSamples() >= 18);
-		}
+            LoopController sub2 = new LoopController();
+            sub2.setLoops(40);
+            sub2.setContinueForever(false);
+            sub2.addTestElement(samp2);
+            controller.addTestElement(sub1);
+            controller.addTestElement(sub2);
+            controller.setRunningVersion(true);
+            sub1.setRunningVersion(true);
+            sub2.setRunningVersion(true);
+            controller.initialize();
+            Sampler sampler = null;
+            int loops = 0;
+            long now = System.currentTimeMillis();
+            while ((sampler = controller.next()) != null) {
+                loops++;
+                sampler.sample(null);
+            }
+            long elapsed = System.currentTimeMillis() - now;
+            assertTrue("Should be at least 20 loops "+loops, loops >= 20);
+            assertTrue("Should be fewer than 30 loops "+loops, loops < 30);
+            assertTrue("Should take at least 10 seconds "+elapsed, elapsed >= 10000);
+            assertTrue("Should take less than 12 seconds "+elapsed, elapsed <= 12000);
+            assertEquals("Sampler 1 should run 2 times", 2, samp1.getSamples());
+            assertTrue("Sampler 2 should run >= 18 times", samp2.getSamples() >= 18);
+        }
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org