Author: jsong
Date: Mon May 9 09:50:52 2005
New Revision: 169337
URL: http://svn.apache.org/viewcvs?rev=169337&view=rev
Log:
Update tests on nested control threading with more effective tests.
Removed:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMultiThread2Control.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMultiThread2ControlImpl.jcs
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMultiThreadControl.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMultiThreadControlImpl.jcs
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveComposite.java
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/threading/DriveComposite2.java
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs?rev=169337&r1=169336&r2=169337&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
(original)
+++
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
Mon May 9 09:50:52 2005
@@ -29,10 +29,7 @@
eventSet2.set2Method2();
eventSet2.set2OverloadedMethod();
eventSet2.set2OverloadedMethod(68);
-
System.out.println("*******************************************");
- System.out.println(" On HelloControlImpl:all events triggered");
-
System.out.println("********************************************");
-
+
}
public void triggerEventsUsingHandle()
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java?rev=169337&r1=169336&r2=169337&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java
Mon May 9 09:50:52 2005
@@ -10,17 +10,12 @@
import junit.framework.TestCase;
import org.apache.beehive.controls.api.bean.ControlBean;
-import
org.apache.beehive.controls.test.controls.threading.nested.CompositeMultiThreadControl;
-import
org.apache.beehive.controls.test.controls.threading.nested.CompositeMultiThreadControlBean;
-import
org.apache.beehive.controls.test.controls.threading.nested.CompositeMultiThread2Control;
-import
org.apache.beehive.controls.test.controls.threading.nested.CompositeMultiThread2ControlBean;
-import org.apache.beehive.controls.test.driver.threading.DriveComposite;
-import org.apache.beehive.controls.test.driver.threading.DriveComposite2;
+import
org.apache.beehive.controls.test.controls.threading.nested.CompositeMThreadControl;
+import
org.apache.beehive.controls.test.controls.threading.nested.CompositeMThreadControlBean;
+import
org.apache.beehive.controls.test.driver.threading.DriveNestedSingleThread;
+import
org.apache.beehive.controls.test.driver.threading.DriveNestedMultiThread;
-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 CompositeTest extends TestCase
@@ -29,58 +24,66 @@
public void setUp() { }
- @Freq("detailed")
+ @Freq("checkin")
public void testNestedSingleThread() throws Exception
{
- CompositeMultiThreadControlBean
sBean=(CompositeMultiThreadControlBean)java.beans.Beans.instantiate(
+ CompositeMThreadControlBean
sBean=(CompositeMThreadControlBean)java.beans.Beans.instantiate(
Thread.currentThread().getContextClassLoader() ,
-
"org.apache.beehive.controls.test.controls.threading.nested.CompositeMultiThreadControlBean");
+
"org.apache.beehive.controls.test.controls.threading.nested.CompositeMThreadControlBean");
+
+ DriveNestedSingleThread singleThreadStarter=new
DriveNestedSingleThread("single thread starter");
+ singleThreadStarter.setControl(sBean);
+ singleThreadStarter.setRole(false);
+ DriveNestedSingleThread singleThreadStopper=new
DriveNestedSingleThread("single thread stopper");
+ singleThreadStopper.setControl(sBean);
+ singleThreadStopper.setRole(true);
- DriveComposite driver1=new DriveComposite("driver_thread_set");
- driver1.setControl(sBean);
- driver1.setMethod(DriveComposite.ACTION_SET);
- DriveComposite driver2=new DriveComposite("driver_thread_read");
- driver2.setControl(sBean);
- driver2.setMethod(DriveComposite.ACTION_READ);
+ singleThreadStarter.start();
+
+ try{Thread.sleep(2000);}
+ catch(InterruptedException e){}
- driver1.start();
- driver2.start();
+ singleThreadStopper.start();
- try{Thread.sleep(200);}
+ try{Thread.sleep(500);}
catch(InterruptedException e){}
- //Report report1=driver1.analyseRecord();
- Report report2=driver2.analyseRecord();
+ int result=singleThreadStopper.getResult();
- Assert.assertEquals(Report.PASS, report2.getStatus());
+ if (result>0)
+ fail("The nested control is not singlethreaded");
}
- @Freq("detailed")
+ @Freq("checkin")
public void testNestedMultiThread() throws Exception
{
- CompositeMultiThread2ControlBean
sBean=(CompositeMultiThread2ControlBean)java.beans.Beans.instantiate(
+ CompositeMThreadControlBean
sBean=(CompositeMThreadControlBean)java.beans.Beans.instantiate(
Thread.currentThread().getContextClassLoader() ,
-
"org.apache.beehive.controls.test.controls.threading.nested.CompositeMultiThread2ControlBean");
+
"org.apache.beehive.controls.test.controls.threading.nested.CompositeMThreadControlBean");
- DriveComposite2 driver1=new
DriveComposite2("driver_thread_set");
- driver1.setControl(sBean);
- driver1.setMethod(DriveComposite.ACTION_SET);
- DriveComposite2 driver2=new
DriveComposite2("driver_thread_read");
- driver2.setControl(sBean);
- driver2.setMethod(DriveComposite.ACTION_READ);
+ DriveNestedMultiThread multiThreadStarter=new
DriveNestedMultiThread("multi thread starter");
+ multiThreadStarter.setControl(sBean);
+ multiThreadStarter.setRole(false);
+ DriveNestedMultiThread multiThreadStopper=new
DriveNestedMultiThread("multi thread stopper");
+ multiThreadStopper.setControl(sBean);
+ multiThreadStopper.setRole(true);
+
+ multiThreadStarter.start();
+
+ try{Thread.sleep(2000);}
+ catch(InterruptedException e){}
- driver1.start();
- driver2.start();
+ multiThreadStopper.start();
- try{Thread.sleep(200);}
+ try{Thread.sleep(500);}
catch(InterruptedException e){}
- //Report report1=driver1.analyseRecord();
- Report report2=driver2.analyseRecord();
+ int result=multiThreadStopper.getResult();
- Assert.assertEquals(Report.PASS, report2.getStatus());
+ if (!(result>0))
+ fail("The nested control is not multithreaded");
}
