You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by js...@apache.org on 2005/05/08 00:50:29 UTC
svn commit: r169116 - in /incubator/beehive/trunk/controls/test/src:
controls/org/apache/beehive/controls/test/controls/threading/
drivers/org/apache/beehive/controls/test/driver/threading/
units/org/apache/beehive/controls/test/java/threading/
Author: jsong
Date: Sat May 7 15:50:27 2005
New Revision: 169116
URL: http://svn.apache.org/viewcvs?rev=169116&view=rev
Log:
Update controls threading test, remove redundant tests.
Removed:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThread2Control.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/MultiThread2ControlImpl.jcs
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThread2Control.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/SingleThread2ControlImpl.jcs
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveMultiThread2.java
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveSingleThread2.java
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java?rev=169116&r1=169115&r2=169116&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java Sat May 7 15:50:27 2005
@@ -12,14 +12,9 @@
import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.threading.MultiThreadControl;
import org.apache.beehive.controls.test.controls.threading.MultiThreadControlBean;
-import org.apache.beehive.controls.test.controls.threading.MultiThread2Control;
-import org.apache.beehive.controls.test.controls.threading.MultiThread2ControlBean;
import org.apache.beehive.controls.test.driver.threading.DriveMultiThread;
-import org.apache.beehive.controls.test.driver.threading.DriveMultiThread2;
-import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
public class MultiThreadTest extends TestCase
@@ -33,7 +28,7 @@
* Makes an instance of a single threaded control, passes it to two different
* threads and run both threads.
*/
- @Freq("detailed")
+ @Freq("checkin")
public void testMultiThread() throws Exception
{
@@ -62,28 +57,4 @@
fail("The control is not multithreaded");
}
- @Freq("checkin")
- public void testMultiThread2() throws Exception
- {
-
- MultiThread2ControlBean sBean=(MultiThread2ControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.threading.MultiThread2ControlBean");
-
- DriveMultiThread2 driver1=new DriveMultiThread2(DriveMultiThread2.SETTER);
- driver1.setControl(sBean);
- DriveMultiThread2 driver2=new DriveMultiThread2(DriveMultiThread2.GETTER);
- driver2.setControl(sBean);
-
- driver1.start();
- driver2.start();
-
- try{Thread.sleep(1000);}
- catch(InterruptedException e){}
-
- Report report1=driver1.analyseRecord();
- Report report2=driver2.analyseRecord();
-
- Assert.assertEquals(Report.PASS, report2.getStatus());
- }
}
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java?rev=169116&r1=169115&r2=169116&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java Sat May 7 15:50:27 2005
@@ -1,7 +1,6 @@
package org.apache.beehive.controls.test.java.threading;
-
import java.lang.Thread;
import java.lang.InterruptedException;
import java.beans.Beans;
@@ -14,27 +13,19 @@
import org.apache.beehive.controls.test.controls.threading.DefaultThreadControlBean;
import org.apache.beehive.controls.test.controls.threading.SingleThreadControl;
import org.apache.beehive.controls.test.controls.threading.SingleThreadControlBean;
-import org.apache.beehive.controls.test.controls.threading.SingleThread2Control;
-import org.apache.beehive.controls.test.controls.threading.SingleThread2ControlBean;
import org.apache.beehive.controls.test.driver.threading.DriveDefaultThread;
import org.apache.beehive.controls.test.driver.threading.DriveSingleThread;
-import org.apache.beehive.controls.test.driver.threading.DriveSingleThread2;
-import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-
-
-@Freq("detailed")
public class SingleThreadTest extends TestCase
{
public SingleThreadTest( String s ) { super( s ); }
public void setUp() { }
- @Freq("detailed")
+ @Freq("checkin")
public void testDefaultThread() throws Exception
{
@@ -67,7 +58,7 @@
* Makes an instance of a single threaded control, passes it to two different
* threads and run both threads.
*/
- @Freq("detailed")
+ @Freq("checkin")
public void testSingleThread() throws Exception
{
@@ -94,31 +85,6 @@
if (result>0)
fail("The control is not singlethreaded");
- }
-
- @Freq("checkin")
- public void testSingleThread2() throws Exception
- {
-
- SingleThread2ControlBean sBean=(SingleThread2ControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.threading.SingleThread2ControlBean");
-
- DriveSingleThread2 driver1=new DriveSingleThread2(DriveSingleThread2.SETTER);
- driver1.setControl(sBean);
- DriveSingleThread2 driver2=new DriveSingleThread2(DriveSingleThread2.GETTER);
- driver2.setControl(sBean);
-
- driver1.start();
- driver2.start();
-
- try{Thread.sleep(1000);}
- catch(InterruptedException e){}
-
- Report report1=driver1.analyseRecord();
- Report report2=driver2.analyseRecord();
-
- Assert.assertEquals(Report.PASS, report2.getStatus());
}
}