Author: sebb
Date: Wed Sep 23 14:48:37 2009
New Revision: 818126
URL: http://svn.apache.org/viewvc?rev=818126&view=rev
Log:
Allow testcases to work with JUnit4 as well as JUnit3
Modified:
jakarta/jmeter/trunk/src/junit/test/RerunTest.java
jakarta/jmeter/trunk/src/junit/test/SetupTestError.java
jakarta/jmeter/trunk/src/junit/test/SetupTestFail.java
Modified: jakarta/jmeter/trunk/src/junit/test/RerunTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/test/RerunTest.java?rev=818126&r1=818125&r2=818126&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/test/RerunTest.java (original)
+++ jakarta/jmeter/trunk/src/junit/test/RerunTest.java Wed Sep 23 14:48:37 2009
@@ -18,6 +18,8 @@
package test;
+import org.junit.Test;
+
import junit.framework.TestCase;
/**
@@ -26,6 +28,7 @@
public class RerunTest extends TestCase {
private int i = 123;
+ @Test
public void testRerun(){
assertEquals(123,i);
i++;
Modified: jakarta/jmeter/trunk/src/junit/test/SetupTestError.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/test/SetupTestError.java?rev=818126&r1=818125&r2=818126&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/test/SetupTestError.java (original)
+++ jakarta/jmeter/trunk/src/junit/test/SetupTestError.java Wed Sep 23 14:48:37
2009
@@ -18,18 +18,23 @@
package test;
+import org.junit.Before;
+import org.junit.Test;
+
import junit.framework.TestCase;
/**
- * Test to demonstrate how setUp failures are handled
+ * Test to demonstrate how setUp errors are handled
*/
public class SetupTestError extends TestCase {
@Override
+ @Before
public void setUp(){
throw new Error("setUp()");
}
+ @Test
public void testSetUpError(){
// Dummy to ensure there is a test to run
}
Modified: jakarta/jmeter/trunk/src/junit/test/SetupTestFail.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/test/SetupTestFail.java?rev=818126&r1=818125&r2=818126&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/test/SetupTestFail.java (original)
+++ jakarta/jmeter/trunk/src/junit/test/SetupTestFail.java Wed Sep 23 14:48:37
2009
@@ -18,6 +18,9 @@
package test;
+import org.junit.Before;
+import org.junit.Test;
+
import junit.framework.TestCase;
/**
@@ -26,10 +29,12 @@
public class SetupTestFail extends TestCase {
@Override
+ @Before
public void setUp(){
fail("setUp()");
}
+ @Test
public void testSetUpFail(){
// Dummy to ensure there is a test to run
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
