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/09/21 22:12:43 UTC

svn commit: r817394 - in /jakarta/jmeter/trunk: build.xml src/junit/woolfel/ src/junit/woolfel/DummyTestCase.java src/junit/woolfel/SubDummyTest.java src/junit/woolfel/SubDummyTest2.java

Author: sebb
Date: Mon Sep 21 20:12:43 2009
New Revision: 817394

URL: http://svn.apache.org/viewvc?rev=817394&view=rev
Log:
Include source for JUnit sample tests

Added:
    jakarta/jmeter/trunk/src/junit/woolfel/
    jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java   (with props)
    jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java   (with props)
    jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java   (with props)
Modified:
    jakarta/jmeter/trunk/build.xml

Modified: jakarta/jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=817394&r1=817393&r2=817394&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Mon Sep 21 20:12:43 2009
@@ -872,10 +872,18 @@
 
     <!-- junit -->
     <jar jarfile="${dest.jar}/ApacheJMeter_junit.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-      <fileset dir="${build.junit}" includes="**/*.class" />
+      <fileset dir="${build.junit}" includes="org/**/*.class" />
       <fileset dir="${src.junit}" includes="**/*.properties" />
       <metainf dir="." includes="LICENSE,NOTICE"/>
     </jar>
+  	<!-- Build junit/test.jar sample -->
+    <jar jarfile="${lib.dir}/junit/test.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
+      <fileset dir="${build.junit}" includes="**/*.class" />
+      <fileset dir="${build.junit}" excludes="org/**/*" />
+      <fileset dir="${src.junit}"   excludes="org/**/*" />
+      <metainf dir="." includes="LICENSE,NOTICE"/>
+    </jar>
+
 
     <!-- report -->
     <jar jarfile="${dest.jar}/ApacheJMeter_report.jar" manifest="${build.dir}/MANIFEST_BIN.MF">

Added: jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java?rev=817394&view=auto
==============================================================================
--- jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java (added)
+++ jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java Mon Sep 21 20:12:43 2009
@@ -0,0 +1,76 @@
+/*
+ * Created on Jul 24, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package woolfel;
+
+import junit.framework.TestCase;
+
+/**
+ * @author pete
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class DummyTestCase extends TestCase {
+
+	/**
+	 * 
+	 */
+	public DummyTestCase() {
+		super();
+	}
+
+	/**
+	 * @param arg0
+	 */
+	protected DummyTestCase(String arg0) {
+		super(arg0);
+	}
+
+    public void setUp(){
+        System.out.println("setup called");
+    }
+    
+    public void tearDown(){
+        System.out.println("tearDown called");
+    }
+    
+    public void testMethodPass() {
+        try {
+            Thread.sleep(100);
+            assertEquals(10,10);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public void testMethodPass2() {
+        try {
+            Thread.sleep(100);
+            assertEquals("one","one");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void testMethodFail() {
+        try {
+            Thread.sleep(100);
+            assertEquals(20,10);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public void testMethodFail2() {
+        try {
+            Thread.sleep(100);
+            assertEquals("one","two");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}

Propchange: jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java?rev=817394&view=auto
==============================================================================
--- jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java (added)
+++ jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java Mon Sep 21 20:12:43 2009
@@ -0,0 +1,40 @@
+/*
+ * Created on Jul 28, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package woolfel;
+
+/**
+ * @author pete
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class SubDummyTest extends DummyTestCase {
+
+	/**
+	 * 
+	 */
+	public SubDummyTest() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @param arg0
+	 */
+	public SubDummyTest(String arg0) {
+		super(arg0);
+		// TODO Auto-generated constructor stub
+	}
+
+    public void oneTimeSetUp() {
+        System.out.println("oneTimeSetUp called -- ");
+    }
+    
+    public void oneTimeTearDown() {
+        System.out.println("oneTimeTearDown called -- ");
+    }
+}

Propchange: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java?rev=817394&view=auto
==============================================================================
--- jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java (added)
+++ jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java Mon Sep 21 20:12:43 2009
@@ -0,0 +1,40 @@
+/*
+ * Created on Jul 28, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package woolfel;
+
+/**
+ * @author pete
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class SubDummyTest2 extends DummyTestCase {
+
+	/**
+	 * 
+	 */
+	private SubDummyTest2() {
+		super();
+        System.out.println("private empty constructor");
+	}
+
+	/**
+	 * @param arg0
+	 */
+	public SubDummyTest2(String arg0) {
+		super(arg0);
+        System.out.println("public string constructor");
+	}
+
+    public void oneTimeSetUp() {
+        System.out.println("oneTimeSetUp called -- ");
+    }
+    
+    public void oneTimeTearDown() {
+        System.out.println("oneTimeTearDown called -- ");
+    }
+}

Propchange: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



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