You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/12 17:23:08 UTC
svn commit: r232310 [15/92] - in /beehive/trunk/controls/test: common/
infra/gtlf/ infra/gtlf/xsl/ infra/mantis/ infra/tch/ infra/tch/messages/
infra/tch/runtime/ infra/tch/schema/ perf/ perf/bin/ perf/cases/
perf/ctlsrc/org/apache/beehive/controls/per...
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ConstraintTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ConstraintTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ConstraintTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ConstraintTest.java Fri Aug 12 08:12:28 2005
@@ -1,93 +1,93 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.property;
-
-
-import java.beans.Beans;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.util.TestBeanContext;
-import org.apache.beehive.controls.test.controls.property.constraint.BookControl;
-import org.apache.beehive.controls.test.controls.property.constraint.BookControlBean;
-import org.apache.beehive.controls.test.controls.property.constraint.PersonControl;
-import org.apache.beehive.controls.test.controls.property.constraint.PersonControlBean;
-import org.apache.beehive.controls.test.driver.property.DrivePropertyConstraint2;
-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;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Misc;
-
-/**
- * Property membership rules are not validated at runtime.
- * Membership rules are validated at build time, when controls are instantiated declaratively.
- * These test should be replaced with build time negative tests.
- */
-@Freq("detailed")
-@Status("inactive")
-@Misc("Negative compile error tests")
-public class ConstraintTest extends TestCase
-{
- //Start of unique client programming to instantiate controls declaratively in java container
- private TestBeanContext _testContext;
-
- public ConstraintTest(String s)throws Exception {
-
- super(s);
- _testContext = new TestBeanContext();
- org.apache.beehive.controls.api.bean.Controls.initializeClient( null, this, _testContext );
-
- }
-
- public void setUp() throws Exception
- {
- _testContext.beginContext();
- }
-
- public void tearDown() throws Exception
- {
- _testContext.endContext();
- }
- //End of unique client programming to instantiate controls declaratively in java container
-
- /**
- * Violating AT_LEAST_ONE, should see a compile error
- */
- @Control
- //@BookControl.Publisher uncomment this line will introduce a compile error
- //@BookControl.Material uncomment this line will introduce a compile error
- //@BookControl.Language uncomment this line will introduce a compile error
- private BookControlBean myAtLeastOneBook;
-
- /**
- * Violating AT_MOST_ONE, should see a compile error
- */
- @Control
- //@BookControl.Language(coverlanguage="Japanese",contentlanguage="Korean") uncomment this line will cause compile error
- private BookControlBean myAtMostOneBook;
-
-
- /**
- * Violating EXACTLY_ONE, should see a compile error
- */
- @Control
- //@BookControl.Intro(title="atitle", subject="asubject") uncomment this line will cause compile error
- private BookControlBean myExactOneBook;
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.property;
+
+
+import java.beans.Beans;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.test.controls.util.TestBeanContext;
+import org.apache.beehive.controls.test.controls.property.constraint.BookControl;
+import org.apache.beehive.controls.test.controls.property.constraint.BookControlBean;
+import org.apache.beehive.controls.test.controls.property.constraint.PersonControl;
+import org.apache.beehive.controls.test.controls.property.constraint.PersonControlBean;
+import org.apache.beehive.controls.test.driver.property.DrivePropertyConstraint2;
+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;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Misc;
+
+/**
+ * Property membership rules are not validated at runtime.
+ * Membership rules are validated at build time, when controls are instantiated declaratively.
+ * These test should be replaced with build time negative tests.
+ */
+@Freq("detailed")
+@Status("inactive")
+@Misc("Negative compile error tests")
+public class ConstraintTest extends TestCase
+{
+ //Start of unique client programming to instantiate controls declaratively in java container
+ private TestBeanContext _testContext;
+
+ public ConstraintTest(String s)throws Exception {
+
+ super(s);
+ _testContext = new TestBeanContext();
+ org.apache.beehive.controls.api.bean.Controls.initializeClient( null, this, _testContext );
+
+ }
+
+ public void setUp() throws Exception
+ {
+ _testContext.beginContext();
+ }
+
+ public void tearDown() throws Exception
+ {
+ _testContext.endContext();
+ }
+ //End of unique client programming to instantiate controls declaratively in java container
+
+ /**
+ * Violating AT_LEAST_ONE, should see a compile error
+ */
+ @Control
+ //@BookControl.Publisher uncomment this line will introduce a compile error
+ //@BookControl.Material uncomment this line will introduce a compile error
+ //@BookControl.Language uncomment this line will introduce a compile error
+ private BookControlBean myAtLeastOneBook;
+
+ /**
+ * Violating AT_MOST_ONE, should see a compile error
+ */
+ @Control
+ //@BookControl.Language(coverlanguage="Japanese",contentlanguage="Korean") uncomment this line will cause compile error
+ private BookControlBean myAtMostOneBook;
+
+
+ /**
+ * Violating EXACTLY_ONE, should see a compile error
+ */
+ @Control
+ //@BookControl.Intro(title="atitle", subject="asubject") uncomment this line will cause compile error
+ private BookControlBean myExactOneBook;
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ConstraintTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/DefaultValueTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/DefaultValueTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/DefaultValueTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/DefaultValueTest.java Fri Aug 12 08:12:28 2005
@@ -1,124 +1,124 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.property;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import java.beans.Beans;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.property.SingleProperty;
-import org.apache.beehive.controls.test.controls.property.SinglePropertyBean;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-import org.apache.beehive.controls.test.controls.util.TestBeanContext;
-
-/**
- * Test objective:
- * JSR175 provides a mechanism for assigning a default value as part of a member definition.
- * The default value must be type consistent with the return type of the methods and it cannot be null.
- * If there is no default value defined, then the declaration of the annotation must include the member
- * (or a compile error will be generated).
- */
-public class DefaultValueTest extends TestCase
-{
- //Start of unique client programming to instantiate controls declaratively in java container
- private TestBeanContext _testContext;
-
- public DefaultValueTest(String s)throws Exception {
-
- super(s);
- _testContext = new TestBeanContext();
- org.apache.beehive.controls.api.bean.Controls.initializeClient( null, this, _testContext );
-
- }
-
- public void setUp() throws Exception
- {
- _testContext.beginContext();
- }
-
- public void tearDown() throws Exception
- {
- _testContext.endContext();
- }
- //End of unique client programming to instantiate controls declaratively in java container
-
- /**
- * If the property has a default value,property annoatation doesn't have the member
- * and should not cause a compile error
- */
- @Control
- @SingleProperty.Greeting
- private SinglePropertyBean myControl;
-
- /**
- * If the property doesn't have a default value,property annoatation doesn't have the member
- * a compile error
- *
- @Control
- @SingleProperty.Identity
- private SinglePropertyBean myControl2;
- */
-
- /**
- * If the property doesn't have a default value,property annoatation has the member
- * no compile error
- */
- @Control
- @SingleProperty.Identity(name="a control")
- private SinglePropertyBean myControl2;
-
-
- /**
- * Accesses property value by getter of the control bean instance.
- * The ccontrol bean is instantiated declaratively
- */
- @Freq("detailed")
- public void testPropertyValue() throws Exception
- {
-
- String greet=myControl.getGreetWord();
- String name=myControl2.getName();
-
- if (greet==null)
- fail("Property with default value is null");
- else{
- if (name==null)
- fail("Property without default value is null");
- else if (!name.equals("a control"))
- fail("Property without default value is set to wrong value:"+name);
- }
- }
-
- /**
- * Accesses property of primitve type by getter
- */
- @Freq("detailed")
- public void testPremitiveType() throws Exception
- {
-
- int defaultAge=myControl.getAge();
-
- if (!(defaultAge==20))
- fail("Default value of primitve type is wrong:"+defaultAge);
- }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.property;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import java.beans.Beans;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.test.controls.property.SingleProperty;
+import org.apache.beehive.controls.test.controls.property.SinglePropertyBean;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+import org.apache.beehive.controls.test.controls.util.TestBeanContext;
+
+/**
+ * Test objective:
+ * JSR175 provides a mechanism for assigning a default value as part of a member definition.
+ * The default value must be type consistent with the return type of the methods and it cannot be null.
+ * If there is no default value defined, then the declaration of the annotation must include the member
+ * (or a compile error will be generated).
+ */
+public class DefaultValueTest extends TestCase
+{
+ //Start of unique client programming to instantiate controls declaratively in java container
+ private TestBeanContext _testContext;
+
+ public DefaultValueTest(String s)throws Exception {
+
+ super(s);
+ _testContext = new TestBeanContext();
+ org.apache.beehive.controls.api.bean.Controls.initializeClient( null, this, _testContext );
+
+ }
+
+ public void setUp() throws Exception
+ {
+ _testContext.beginContext();
+ }
+
+ public void tearDown() throws Exception
+ {
+ _testContext.endContext();
+ }
+ //End of unique client programming to instantiate controls declaratively in java container
+
+ /**
+ * If the property has a default value,property annoatation doesn't have the member
+ * and should not cause a compile error
+ */
+ @Control
+ @SingleProperty.Greeting
+ private SinglePropertyBean myControl;
+
+ /**
+ * If the property doesn't have a default value,property annoatation doesn't have the member
+ * a compile error
+ *
+ @Control
+ @SingleProperty.Identity
+ private SinglePropertyBean myControl2;
+ */
+
+ /**
+ * If the property doesn't have a default value,property annoatation has the member
+ * no compile error
+ */
+ @Control
+ @SingleProperty.Identity(name="a control")
+ private SinglePropertyBean myControl2;
+
+
+ /**
+ * Accesses property value by getter of the control bean instance.
+ * The ccontrol bean is instantiated declaratively
+ */
+ @Freq("detailed")
+ public void testPropertyValue() throws Exception
+ {
+
+ String greet=myControl.getGreetWord();
+ String name=myControl2.getName();
+
+ if (greet==null)
+ fail("Property with default value is null");
+ else{
+ if (name==null)
+ fail("Property without default value is null");
+ else if (!name.equals("a control"))
+ fail("Property without default value is set to wrong value:"+name);
+ }
+ }
+
+ /**
+ * Accesses property of primitve type by getter
+ */
+ @Freq("detailed")
+ public void testPremitiveType() throws Exception
+ {
+
+ int defaultAge=myControl.getAge();
+
+ if (!(defaultAge==20))
+ fail("Default value of primitve type is wrong:"+defaultAge);
+ }
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/DefaultValueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java Fri Aug 12 08:12:28 2005
@@ -1,110 +1,110 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.property;
-
-import junit.framework.TestCase;
-import java.beans.Beans;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
-import org.apache.beehive.controls.test.driver.property.DriveContextAccess;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-import org.apache.beehive.controls.test.controls.util.TestBeanContext;
-
-/**
- * A TestCase that tests accessing property values via control context in control impl
- * All tests on controls instantiated declaratively are deactivated until this feature is supported.
- */
-public class ImplAccessTest extends TestCase
-{
- //Start of unique client programming to instantiate controls declaratively in java container
- private TestBeanContext _testContext;
-
- public ImplAccessTest(String s)throws Exception {
-
- super(s);
- _testContext = new TestBeanContext();
- org.apache.beehive.controls.api.bean.Controls.initializeClient( null, this, _testContext );
-
- }
-
- public void setUp() throws Exception
- {
- _testContext.beginContext();
- }
-
- public void tearDown() throws Exception
- {
- _testContext.endContext();
- }
- //End of unique client programming to instantiate controls declaratively in java container
-
- /**
- * A control that declares some propertySets in its control interface.
- * It has a method that allow accessing these property values via control context.
- */
- @Control
- public PropertyControlBean myControl;
-
-
- /**
- * Tests accessing property values via control context.
- * By invoking sayHello method, the property value is retrieved via control context.
- * The control bean is instantiated by declaration.
- */
- @Freq("detailed")
- public void testContextAccessByDeclare() throws Exception
- {
-
- Report report=new Report();
- DriveContextAccess driver=new DriveContextAccess();
- driver.setControl(myControl);
- report=driver.doTest();
- String result=report.getStatus();
- if (!result.equals(Report.PASS))
- fail(report.getMessage());
-
- }
-
- /**
- * Tests accessing property values via control context.
- * By invoking sayHello method, the property value is retrieved via control context.
- * The control bean is instantiated programmatically.
- */
- @Freq("checkin")
- public void testContextAccessByProgram() throws Exception
- {
- Report report=new Report();
- PropertyControlBean sbean=(PropertyControlBean)Beans.instantiate(
- Thread.currentThread().getContextClassLoader(),
- "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
- DriveContextAccess driver=new DriveContextAccess();
- driver.setControl(sbean);
- report=driver.doTest();
- String result=report.getStatus();
- if (!result.equals(Report.PASS))
- fail(report.getMessage());
-
-
- }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.property;
+
+import junit.framework.TestCase;
+import java.beans.Beans;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
+import org.apache.beehive.controls.test.driver.property.DriveContextAccess;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+import org.apache.beehive.controls.test.controls.util.TestBeanContext;
+
+/**
+ * A TestCase that tests accessing property values via control context in control impl
+ * All tests on controls instantiated declaratively are deactivated until this feature is supported.
+ */
+public class ImplAccessTest extends TestCase
+{
+ //Start of unique client programming to instantiate controls declaratively in java container
+ private TestBeanContext _testContext;
+
+ public ImplAccessTest(String s)throws Exception {
+
+ super(s);
+ _testContext = new TestBeanContext();
+ org.apache.beehive.controls.api.bean.Controls.initializeClient( null, this, _testContext );
+
+ }
+
+ public void setUp() throws Exception
+ {
+ _testContext.beginContext();
+ }
+
+ public void tearDown() throws Exception
+ {
+ _testContext.endContext();
+ }
+ //End of unique client programming to instantiate controls declaratively in java container
+
+ /**
+ * A control that declares some propertySets in its control interface.
+ * It has a method that allow accessing these property values via control context.
+ */
+ @Control
+ public PropertyControlBean myControl;
+
+
+ /**
+ * Tests accessing property values via control context.
+ * By invoking sayHello method, the property value is retrieved via control context.
+ * The control bean is instantiated by declaration.
+ */
+ @Freq("detailed")
+ public void testContextAccessByDeclare() throws Exception
+ {
+
+ Report report=new Report();
+ DriveContextAccess driver=new DriveContextAccess();
+ driver.setControl(myControl);
+ report=driver.doTest();
+ String result=report.getStatus();
+ if (!result.equals(Report.PASS))
+ fail(report.getMessage());
+
+ }
+
+ /**
+ * Tests accessing property values via control context.
+ * By invoking sayHello method, the property value is retrieved via control context.
+ * The control bean is instantiated programmatically.
+ */
+ @Freq("checkin")
+ public void testContextAccessByProgram() throws Exception
+ {
+ Report report=new Report();
+ PropertyControlBean sbean=(PropertyControlBean)Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
+ DriveContextAccess driver=new DriveContextAccess();
+ driver.setControl(sbean);
+ report=driver.doTest();
+ String result=report.getStatus();
+ if (!result.equals(Report.PASS))
+ fail(report.getMessage());
+
+
+ }
+
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/PropEventsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/s13n/DeclarativeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/s13n/Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java Fri Aug 12 08:12:28 2005
@@ -1,108 +1,108 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.threading;
-
-
-
-import java.lang.Thread;
-import java.lang.InterruptedException;
-import java.beans.Beans;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.beehive.controls.api.bean.ControlBean;
-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.mantis.annotations.tch.Freq;
-
-
-public class CompositeTest extends TestCase
-{
- public CompositeTest( String s ) { super( s ); }
-
- public void setUp() { }
-
- @Freq("checkin")
- public void testNestedSingleThread() throws Exception
- {
-
- CompositeMThreadControlBean sBean=(CompositeMThreadControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "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);
-
- singleThreadStarter.start();
-
- try{Thread.sleep(2000);}
- catch(InterruptedException e){}
-
- singleThreadStopper.start();
-
- try{Thread.sleep(500);}
- catch(InterruptedException e){}
-
- int result=singleThreadStopper.getResult();
-
- if (result>0)
- fail("The nested control is not singlethreaded");
- }
-
- @Freq("checkin")
- public void testNestedMultiThread() throws Exception
- {
-
- CompositeMThreadControlBean sBean=(CompositeMThreadControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.threading.nested.CompositeMThreadControlBean");
-
- 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){}
-
- multiThreadStopper.start();
-
- try{Thread.sleep(500);}
- catch(InterruptedException e){}
-
- int result=multiThreadStopper.getResult();
-
- if (!(result>0))
- fail("The nested control is not multithreaded");
- }
-
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.threading;
+
+
+
+import java.lang.Thread;
+import java.lang.InterruptedException;
+import java.beans.Beans;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.beehive.controls.api.bean.ControlBean;
+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.mantis.annotations.tch.Freq;
+
+
+public class CompositeTest extends TestCase
+{
+ public CompositeTest( String s ) { super( s ); }
+
+ public void setUp() { }
+
+ @Freq("checkin")
+ public void testNestedSingleThread() throws Exception
+ {
+
+ CompositeMThreadControlBean sBean=(CompositeMThreadControlBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "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);
+
+ singleThreadStarter.start();
+
+ try{Thread.sleep(2000);}
+ catch(InterruptedException e){}
+
+ singleThreadStopper.start();
+
+ try{Thread.sleep(500);}
+ catch(InterruptedException e){}
+
+ int result=singleThreadStopper.getResult();
+
+ if (result>0)
+ fail("The nested control is not singlethreaded");
+ }
+
+ @Freq("checkin")
+ public void testNestedMultiThread() throws Exception
+ {
+
+ CompositeMThreadControlBean sBean=(CompositeMThreadControlBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.threading.nested.CompositeMThreadControlBean");
+
+ 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){}
+
+ multiThreadStopper.start();
+
+ try{Thread.sleep(500);}
+ catch(InterruptedException e){}
+
+ int result=multiThreadStopper.getResult();
+
+ if (!(result>0))
+ fail("The nested control is not multithreaded");
+ }
+
+
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/CompositeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java Fri Aug 12 08:12:28 2005
@@ -1,76 +1,76 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.threading;
-
-
-
-import java.lang.Thread;
-import java.lang.InterruptedException;
-import java.beans.Beans;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-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.driver.threading.DriveMultiThread;
-
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
-
-public class MultiThreadTest extends TestCase
-{
- public MultiThreadTest( String s ) { super( s ); }
-
- public void setUp() { }
-
-
- /**
- * Makes an instance of a single threaded control, passes it to two different
- * threads and run both threads.
- */
- @Freq("checkin")
- public void testMultiThread() throws Exception
- {
-
- MultiThreadControlBean sBean=(MultiThreadControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.threading.MultiThreadControlBean");
-
- DriveMultiThread driver1=new DriveMultiThread("MultiThread-driver1");
- driver1.setControl(sBean);
- driver1.setRole(true);
- DriveMultiThread driver2=new DriveMultiThread("MultiThread-driver2");
- driver2.setControl(sBean);
- driver2.setRole(false);
-
- driver1.start();
- try{Thread.currentThread().sleep(2000);}
- catch(InterruptedException e){e.printStackTrace();}
- driver2.start();
-
- try{Thread.currentThread().sleep(2000);}
- catch(InterruptedException e){e.printStackTrace();}
-
- long result=driver2.getResult();
-
- if (!(result>0))
- fail("The control is not multithreaded");
- }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.threading;
+
+
+
+import java.lang.Thread;
+import java.lang.InterruptedException;
+import java.beans.Beans;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+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.driver.threading.DriveMultiThread;
+
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+
+
+public class MultiThreadTest extends TestCase
+{
+ public MultiThreadTest( String s ) { super( s ); }
+
+ public void setUp() { }
+
+
+ /**
+ * Makes an instance of a single threaded control, passes it to two different
+ * threads and run both threads.
+ */
+ @Freq("checkin")
+ public void testMultiThread() throws Exception
+ {
+
+ MultiThreadControlBean sBean=(MultiThreadControlBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.threading.MultiThreadControlBean");
+
+ DriveMultiThread driver1=new DriveMultiThread("MultiThread-driver1");
+ driver1.setControl(sBean);
+ driver1.setRole(true);
+ DriveMultiThread driver2=new DriveMultiThread("MultiThread-driver2");
+ driver2.setControl(sBean);
+ driver2.setRole(false);
+
+ driver1.start();
+ try{Thread.currentThread().sleep(2000);}
+ catch(InterruptedException e){e.printStackTrace();}
+ driver2.start();
+
+ try{Thread.currentThread().sleep(2000);}
+ catch(InterruptedException e){e.printStackTrace();}
+
+ long result=driver2.getResult();
+
+ if (!(result>0))
+ fail("The control is not multithreaded");
+ }
+
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/MultiThreadTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java Fri Aug 12 08:12:28 2005
@@ -1,108 +1,108 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.threading;
-
-
-import java.lang.Thread;
-import java.lang.InterruptedException;
-import java.beans.Beans;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.threading.DefaultThreadControl;
-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.driver.threading.DriveDefaultThread;
-import org.apache.beehive.controls.test.driver.threading.DriveSingleThread;
-
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
-
-public class SingleThreadTest extends TestCase
-{
- public SingleThreadTest( String s ) { super( s ); }
-
- public void setUp() { }
-
- @Freq("checkin")
- public void testDefaultThread() throws Exception
- {
-
- DefaultThreadControlBean sBean=(DefaultThreadControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.threading.DefaultThreadControlBean");
-
- DriveDefaultThread driver1=new DriveDefaultThread("DefaultThread-driver1");
- driver1.setControl(sBean);
- driver1.setRole(true);
- DriveDefaultThread driver2=new DriveDefaultThread("DefaultThread-driver2");
- driver2.setControl(sBean);
- driver2.setRole(false);
-
- driver1.start();
- try{Thread.currentThread().sleep(2000);}
- catch(InterruptedException e){e.printStackTrace();}
- driver2.start();
-
- try{Thread.currentThread().sleep(2000);}
- catch(InterruptedException e){e.printStackTrace();}
-
- long result=driver2.getResult();
-
- if (result>0)
- fail("The control is not singlethreaded");
- }
-
- /**
- * Makes an instance of a single threaded control, passes it to two different
- * threads and run both threads.
- */
- @Freq("checkin")
- public void testSingleThread() throws Exception
- {
-
- SingleThreadControlBean sBean=(SingleThreadControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.threading.SingleThreadControlBean");
-
- DriveSingleThread driver1=new DriveSingleThread("SingleThread-driver1");
- driver1.setControl(sBean);
- driver1.setRole(true);
- DriveSingleThread driver2=new DriveSingleThread("SingleThread-driver2");
- driver2.setControl(sBean);
- driver2.setRole(false);
-
- driver1.start();
- try{Thread.currentThread().sleep(2000);}
- catch(InterruptedException e){e.printStackTrace();}
- driver2.start();
-
- try{Thread.currentThread().sleep(2000);}
- catch(InterruptedException e){e.printStackTrace();}
-
- long result=driver2.getResult();
-
- if (result>0)
- fail("The control is not singlethreaded");
- }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.threading;
+
+
+import java.lang.Thread;
+import java.lang.InterruptedException;
+import java.beans.Beans;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.test.controls.threading.DefaultThreadControl;
+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.driver.threading.DriveDefaultThread;
+import org.apache.beehive.controls.test.driver.threading.DriveSingleThread;
+
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+
+
+public class SingleThreadTest extends TestCase
+{
+ public SingleThreadTest( String s ) { super( s ); }
+
+ public void setUp() { }
+
+ @Freq("checkin")
+ public void testDefaultThread() throws Exception
+ {
+
+ DefaultThreadControlBean sBean=(DefaultThreadControlBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.threading.DefaultThreadControlBean");
+
+ DriveDefaultThread driver1=new DriveDefaultThread("DefaultThread-driver1");
+ driver1.setControl(sBean);
+ driver1.setRole(true);
+ DriveDefaultThread driver2=new DriveDefaultThread("DefaultThread-driver2");
+ driver2.setControl(sBean);
+ driver2.setRole(false);
+
+ driver1.start();
+ try{Thread.currentThread().sleep(2000);}
+ catch(InterruptedException e){e.printStackTrace();}
+ driver2.start();
+
+ try{Thread.currentThread().sleep(2000);}
+ catch(InterruptedException e){e.printStackTrace();}
+
+ long result=driver2.getResult();
+
+ if (result>0)
+ fail("The control is not singlethreaded");
+ }
+
+ /**
+ * Makes an instance of a single threaded control, passes it to two different
+ * threads and run both threads.
+ */
+ @Freq("checkin")
+ public void testSingleThread() throws Exception
+ {
+
+ SingleThreadControlBean sBean=(SingleThreadControlBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.threading.SingleThreadControlBean");
+
+ DriveSingleThread driver1=new DriveSingleThread("SingleThread-driver1");
+ driver1.setControl(sBean);
+ driver1.setRole(true);
+ DriveSingleThread driver2=new DriveSingleThread("SingleThread-driver2");
+ driver2.setControl(sBean);
+ driver2.setRole(false);
+
+ driver1.start();
+ try{Thread.currentThread().sleep(2000);}
+ catch(InterruptedException e){e.printStackTrace();}
+ driver2.start();
+
+ try{Thread.currentThread().sleep(2000);}
+ catch(InterruptedException e){e.printStackTrace();}
+
+ long result=driver2.getResult();
+
+ if (result>0)
+ fail("The control is not singlethreaded");
+ }
+
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/threading/SingleThreadTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/versioning/VersionRequiredTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/versioning/VersionRequiredTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/versioning/VersionRequiredTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/versioning/VersionRequiredTest.java Fri Aug 12 08:12:28 2005
@@ -1,54 +1,54 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.java.versioning;
-
-
-import java.beans.Beans;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.versioning.VersionRequired;
-import org.apache.beehive.controls.test.controls.versioning.HelloBean;
-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("checkin")
-public class VersionRequiredTest extends TestCase
-{
- public VersionRequiredTest( String s ) { super( s ); }
-
- public void setUp() { }
-
- /**
- * A control that declares a version requirement
- */
- @Control
- @VersionRequired(major=2)
- public HelloBean helloBean;
-
-
- @Freq("checkin")
- public void testRequiredVersion() throws Exception
- {
- }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.java.versioning;
+
+
+import java.beans.Beans;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.versioning.VersionRequired;
+import org.apache.beehive.controls.test.controls.versioning.HelloBean;
+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("checkin")
+public class VersionRequiredTest extends TestCase
+{
+ public VersionRequiredTest( String s ) { super( s ); }
+
+ public void setUp() { }
+
+ /**
+ * A control that declares a version requirement
+ */
+ @Control
+ @VersionRequired(major=2)
+ public HelloBean helloBean;
+
+
+ @Freq("checkin")
+ public void testRequiredVersion() throws Exception
+ {
+ }
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/versioning/VersionRequiredTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/binding/TestControlBinding.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/binding/TestControlBinding.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/binding/TestControlBinding.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/binding/TestControlBinding.java Fri Aug 12 08:12:28 2005
@@ -1,54 +1,54 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.jpf.binding;
-
-import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
-
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Desc;
-
-public class TestControlBinding extends HtmlReportTestCase
-{
- public TestControlBinding(String s){super(s);}
-
- @Freq("checkin")
- @Desc("Test that a control implementation can be overridden with binding: " +
- "http://issues.apache.org/jira/browse/BEEHIVE-20")
- public void testBindingOverride() throws Exception
- {
- assertReport("/controlsWeb/binding/index.jsp", "testBindingOverride");
- }
-
- @Freq("checkin")
- @Desc("Test that a @ControlImplementation can set a defaultBinding " +
- "to an impl that is not the default naming scheme (ie ControlNameImpl)")
- public void testDefaultBinding() throws Exception
- {
- assertReport("/controlsWeb/binding/index.jsp", "testDefaultBinding");
- }
-
- @Freq("checkin")
- @Desc("Test that a control implementation can be overridden with external binding " +
- "to an impl that is specified in controlbindings.properties")
- public void testExternalBinding() throws Exception
- {
- assertReport("/controlsWeb/binding/index.jsp", "testExternalBinding");
- }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.jpf.binding;
+
+import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
+
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Desc;
+
+public class TestControlBinding extends HtmlReportTestCase
+{
+ public TestControlBinding(String s){super(s);}
+
+ @Freq("checkin")
+ @Desc("Test that a control implementation can be overridden with binding: " +
+ "http://issues.apache.org/jira/browse/BEEHIVE-20")
+ public void testBindingOverride() throws Exception
+ {
+ assertReport("/controlsWeb/binding/index.jsp", "testBindingOverride");
+ }
+
+ @Freq("checkin")
+ @Desc("Test that a @ControlImplementation can set a defaultBinding " +
+ "to an impl that is not the default naming scheme (ie ControlNameImpl)")
+ public void testDefaultBinding() throws Exception
+ {
+ assertReport("/controlsWeb/binding/index.jsp", "testDefaultBinding");
+ }
+
+ @Freq("checkin")
+ @Desc("Test that a control implementation can be overridden with external binding " +
+ "to an impl that is specified in controlbindings.properties")
+ public void testExternalBinding() throws Exception
+ {
+ assertReport("/controlsWeb/binding/index.jsp", "testExternalBinding");
+ }
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/binding/TestControlBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/context/TestContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/context/TestContext.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/context/TestContext.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/context/TestContext.java Fri Aug 12 08:12:28 2005
@@ -1,55 +1,55 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.jpf.context;
-
-import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-
-
-
-/**
- * Tests controls context when instantiated by a pageflow running on a Tomcat server
- */
-public class TestContext extends HtmlReportTestCase
-{
- public TestContext(String s){
- super(s);
- }
- /**
- * Tests getting other services from control context.
- * The control is instantiated declaratively
- */
- @Freq("checkin")
- public void testOtherServicesByDeclare() throws Exception
- {
- assertReport("/controlsWeb/context/getotherservice/Controller.jpf");
- }
-
- /**
- * Tests getting other services from control context.
- * The control is instantiated programmatically
- */
- @Freq("detailed")
- public void testOtherServicesByProgram() throws Exception
- {
- assertReport("/controlsWeb/context/getotherservice2/Controller.jpf");
- }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.jpf.context;
+
+import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
+
+
+
+/**
+ * Tests controls context when instantiated by a pageflow running on a Tomcat server
+ */
+public class TestContext extends HtmlReportTestCase
+{
+ public TestContext(String s){
+ super(s);
+ }
+ /**
+ * Tests getting other services from control context.
+ * The control is instantiated declaratively
+ */
+ @Freq("checkin")
+ public void testOtherServicesByDeclare() throws Exception
+ {
+ assertReport("/controlsWeb/context/getotherservice/Controller.jpf");
+ }
+
+ /**
+ * Tests getting other services from control context.
+ * The control is instantiated programmatically
+ */
+ @Freq("detailed")
+ public void testOtherServicesByProgram() throws Exception
+ {
+ assertReport("/controlsWeb/context/getotherservice2/Controller.jpf");
+ }
+
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/context/TestContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java Fri Aug 12 08:12:28 2005
@@ -1,65 +1,65 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.jpf.contextevent;
-
-import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-
-
-
-/**
- * Tests control context events
- */
-public class TestLifecycleEvent extends HtmlReportTestCase
-{
- public TestLifecycleEvent(String s){
- super(s);
- }
- /**
- * Verifies control implmentation receiving control lifecycle events.
- * The control is instantiated declaratively by the pageflow
- */
- @Freq("checkin")
- public void testReceivedByImpl() throws Exception
- {
- assertReport("/controlsWeb/contextevent/implrecord/Controller.jpf");
- }
-
- /**
- * Verifies control implmentation receiving control lifecycle events.
- * The control is instantiated programmatically by the pageflow
- */
- @Freq("checkin")
- public void testReceivedByImpl2() throws Exception
- {
- assertReport("/controlsWeb/contextevent/implrecord2/Controller.jpf");
- }
-
- /**
- * Tests receiving control lifecycle events from control bean instance.
- */
- @Freq("checkin")
- public void testListenFromBean() throws Exception
- {
- assertReport("/controlsWeb/contextevent/beanrecord/Controller.jpf");
- }
-
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.jpf.contextevent;
+
+import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
+
+
+
+/**
+ * Tests control context events
+ */
+public class TestLifecycleEvent extends HtmlReportTestCase
+{
+ public TestLifecycleEvent(String s){
+ super(s);
+ }
+ /**
+ * Verifies control implmentation receiving control lifecycle events.
+ * The control is instantiated declaratively by the pageflow
+ */
+ @Freq("checkin")
+ public void testReceivedByImpl() throws Exception
+ {
+ assertReport("/controlsWeb/contextevent/implrecord/Controller.jpf");
+ }
+
+ /**
+ * Verifies control implmentation receiving control lifecycle events.
+ * The control is instantiated programmatically by the pageflow
+ */
+ @Freq("checkin")
+ public void testReceivedByImpl2() throws Exception
+ {
+ assertReport("/controlsWeb/contextevent/implrecord2/Controller.jpf");
+ }
+
+ /**
+ * Tests receiving control lifecycle events from control bean instance.
+ */
+ @Freq("checkin")
+ public void testListenFromBean() throws Exception
+ {
+ assertReport("/controlsWeb/contextevent/beanrecord/Controller.jpf");
+ }
+
+
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java Fri Aug 12 08:12:28 2005
@@ -1,53 +1,53 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.jpf.event;
-
-import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-
-
-
-/**
- * Tests pageflow receiving events raised by a control
- */
-public class TestEvent extends HtmlReportTestCase
-{
- public TestEvent(String s){super(s);}
- /**
- * Tests receiving control's events by EventHandler annotation
- */
- @Freq("detailed")
- public void testByEventHandler() throws Exception
- {
- assertReport("/controlsWeb/event/eventhandler/begin.do");
- //assertReport("/controlsWeb/event/eventhandler/verifyResult.do");
-
- }
-
- /**
- * Tests receiving control's events by registered listeners.
- * The pageflow instantiates the control declaratively
- */
- @Freq("checkin")
- public void testByListener() throws Exception
- {
- assertReport("/controlsWeb/event/listener/Controller.jpf");
- }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.jpf.event;
+
+import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
+
+
+
+/**
+ * Tests pageflow receiving events raised by a control
+ */
+public class TestEvent extends HtmlReportTestCase
+{
+ public TestEvent(String s){super(s);}
+ /**
+ * Tests receiving control's events by EventHandler annotation
+ */
+ @Freq("detailed")
+ public void testByEventHandler() throws Exception
+ {
+ assertReport("/controlsWeb/event/eventhandler/begin.do");
+ //assertReport("/controlsWeb/event/eventhandler/verifyResult.do");
+
+ }
+
+ /**
+ * Tests receiving control's events by registered listeners.
+ * The pageflow instantiates the control declaratively
+ */
+ @Freq("checkin")
+ public void testByListener() throws Exception
+ {
+ assertReport("/controlsWeb/event/listener/Controller.jpf");
+ }
+}
Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
------------------------------------------------------------------------------
svn:eol-style = native