svn commit: r232310 [14/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...

[ek...@apache.org]

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java Fri Aug 12 08:12:28 2005
@@ -1,149 +1,149 @@
-/*
- * 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.event;
-
-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.event.Hello;
-import org.apache.beehive.controls.test.controls.event.HelloBean;
-import org.apache.beehive.controls.test.controls.util.TestBeanContext;
-import org.apache.beehive.controls.test.driver.event.DriveListener;
-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 receiving events from a control with an inner class or
- * an instance of listener class.
- * All tests on controls instantiated declaratively are deactivated until this feature is supported.
- */
-public class ListenerTest extends TestCase
-{
-
-    //Start of unique client programming to instantiate controls declaratively in java container
-    private TestBeanContext _testContext;
-
-    public ListenerTest(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
-
-	private boolean innerClassReceiveEvent_declare=false;
-	private boolean innerClassReceiveEvent_program=false;
-
-	/**
-	 * A control that raises events
-	 */
-    @Control
-    public HelloBean myHellobean;
-
-    /**
-     * 1. Instantiates a control bean programmatically;
-     * 2. Registers two event listeners to the bean instance;
-     * 3. Invokes the method on the bean instance that triggers the event1 and event2
-     */
-    public void testListenerReceiveEventsProgram() throws Exception
-    {
-		Report report=new Report();
-		HelloBean hellobean=(HelloBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.event.HelloBean");
-        testListenerReceiveEvents(hellobean, false);
-    }
-
-    public void testListenerReceiveEventsProgramUsingHandle() throws Exception
-    {
-        TestBeanContext beanContext = new TestBeanContext();
-        beanContext.beginContext();
-        try
-        {
-		    Report report=new Report();
-		    HelloBean hellobean=(HelloBean)java.beans.Beans.instantiate(
-		    	Thread.currentThread().getContextClassLoader() ,
-			    "org.apache.beehive.controls.test.controls.event.HelloBean");
-            beanContext.add(hellobean);
-            testListenerReceiveEvents(hellobean, true);
-        }
-        finally
-        {
-            beanContext.endContext();
-        }
-    }
-
-    /**
-     * 1. Instantiates a control bean by declaration;
-     * 2. Registers two event listeners to the bean instance;
-     * 3. Invokes the method on the bean instance that triggers the event1 and event2
-     */
-	@Freq("checkin")
-    public void testListenerReceiveEventsDeclare() throws Exception
-    {
-        testListenerReceiveEvents(myHellobean, false);
-    }
-
-	@Freq("checkin")
-    public void testListenerReceiveEventsDeclareUsingHandle() throws Exception
-    {
-        testListenerReceiveEvents(myHellobean, true);
-    }
-
-    /**
-     * Main body of test logic used by the various programmatic and declarative tests
-     */
-	@Freq("checkin")
-	@Status("inactive")
-    private void testListenerReceiveEvents(HelloBean hellobean, boolean useHandle)
-    {
-		Report report=new Report();
-		DriveListener driver=new DriveListener();
-		driver.setControl(hellobean);
-		report=driver.doTest(useHandle);
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-		try{
-			Thread.currentThread().sleep(1000);
-			report=driver.verifyResult();
-			result=report.getStatus();
-			if (!result.equals(Report.PASS))
-				fail(report.getMessage());
-		}
-		catch(Exception e){
-			fail("Exception caught:"+e.toString());
-		}
-    }
-}
+/*
+ * 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.event;
+
+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.event.Hello;
+import org.apache.beehive.controls.test.controls.event.HelloBean;
+import org.apache.beehive.controls.test.controls.util.TestBeanContext;
+import org.apache.beehive.controls.test.driver.event.DriveListener;
+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 receiving events from a control with an inner class or
+ * an instance of listener class.
+ * All tests on controls instantiated declaratively are deactivated until this feature is supported.
+ */
+public class ListenerTest extends TestCase
+{
+
+    //Start of unique client programming to instantiate controls declaratively in java container
+    private TestBeanContext _testContext;
+
+    public ListenerTest(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
+
+	private boolean innerClassReceiveEvent_declare=false;
+	private boolean innerClassReceiveEvent_program=false;
+
+	/**
+	 * A control that raises events
+	 */
+    @Control
+    public HelloBean myHellobean;
+
+    /**
+     * 1. Instantiates a control bean programmatically;
+     * 2. Registers two event listeners to the bean instance;
+     * 3. Invokes the method on the bean instance that triggers the event1 and event2
+     */
+    public void testListenerReceiveEventsProgram() throws Exception
+    {
+		Report report=new Report();
+		HelloBean hellobean=(HelloBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.event.HelloBean");
+        testListenerReceiveEvents(hellobean, false);
+    }
+
+    public void testListenerReceiveEventsProgramUsingHandle() throws Exception
+    {
+        TestBeanContext beanContext = new TestBeanContext();
+        beanContext.beginContext();
+        try
+        {
+		    Report report=new Report();
+		    HelloBean hellobean=(HelloBean)java.beans.Beans.instantiate(
+		    	Thread.currentThread().getContextClassLoader() ,
+			    "org.apache.beehive.controls.test.controls.event.HelloBean");
+            beanContext.add(hellobean);
+            testListenerReceiveEvents(hellobean, true);
+        }
+        finally
+        {
+            beanContext.endContext();
+        }
+    }
+
+    /**
+     * 1. Instantiates a control bean by declaration;
+     * 2. Registers two event listeners to the bean instance;
+     * 3. Invokes the method on the bean instance that triggers the event1 and event2
+     */
+	@Freq("checkin")
+    public void testListenerReceiveEventsDeclare() throws Exception
+    {
+        testListenerReceiveEvents(myHellobean, false);
+    }
+
+	@Freq("checkin")
+    public void testListenerReceiveEventsDeclareUsingHandle() throws Exception
+    {
+        testListenerReceiveEvents(myHellobean, true);
+    }
+
+    /**
+     * Main body of test logic used by the various programmatic and declarative tests
+     */
+	@Freq("checkin")
+	@Status("inactive")
+    private void testListenerReceiveEvents(HelloBean hellobean, boolean useHandle)
+    {
+		Report report=new Report();
+		DriveListener driver=new DriveListener();
+		driver.setControl(hellobean);
+		report=driver.doTest(useHandle);
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+		try{
+			Thread.currentThread().sleep(1000);
+			report=driver.verifyResult();
+			result=report.getStatus();
+			if (!result.equals(Report.PASS))
+				fail(report.getMessage());
+		}
+		catch(Exception e){
+			fail("Exception caught:"+e.toString());
+		}
+    }
+}

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java Fri Aug 12 08:12:28 2005
@@ -1,537 +1,537 @@
-/*
- * 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.extension;
-
-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.extension.SubControlBean;
-import org.apache.beehive.controls.test.driver.extension.DriveSubControl;
-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 TeseCase that tests control inheritance by instantiating a subcontrol and invoking the methods
- * and getting/setting the properties.
- * All tests on controls instantiated declaratively are deactivated until this feature is supported.
- */
-public class SubControlTest extends TestCase
-{
-
-    //Start of unique client programming to instantiate controls declaratively in java container
-    private TestBeanContext _testContext;
-
-    public SubControlTest(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 extending ExtensibleControl in the same package
-     */
-    @Control
-    public SubControlBean subcontrol;
-
-    /**
-     * Tests getting/setting a property declared on super control interface
-	 * that is annotated with @Inherited
-     */
-	@Freq("detailed")
-    public void testAnnotatedInheritedProperty() throws Exception
-    {
-		String theBirthplace=subcontrol.getBirthplace();
-
-		if (theBirthplace==null)
-			fail("The property annotated with @Inherited is NULL");
-		else{
-			if (theBirthplace.equals("ExtensibleControl")){
-				subcontrol.setBirthplace("JUNIT");
-				String resetValue=subcontrol.getAnnotatedInheritedPropertyByContext();
-				if (!resetValue.equals("JUNIT"))
-					fail("Reset value of the annotated inherited property is incorrect:"+resetValue);
-			}
-			else
-				fail("The property annotated with @Inherited has an incorrect value:"+theBirthplace);
-		}
-    }
-
-
-    /**
-     * Tests invoking a method inherited by the subcontrol
-     */
-	@Freq("detailed")
-    public void testInheritedMethod() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doInvokeInheritedMethod();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests invoking a method inherited by the subcontrol.
-     * The subcontrol is instantiated programmically
-     */
-	@Freq("checkin")
-    public void testInheritedMethod2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
-				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doInvokeInheritedMethod();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests invoking a method declared on the subcontrol
-     */
-	@Freq("detailed")
-    public void testExtendedMethod() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doInvokeExtendedMethod();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests invoking a method declared on the subcontrol
-     * The subcontrol is instantiated programmically
-     */
-	@Freq("checkin")
-    public void testExtendedMethod2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
-				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doInvokeExtendedMethod();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting propertySet inherited from ExtensibleControl from a subcontrol instance.
-     * The property is retrieved via control context.
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-	@Status("inactive")
-    public void testGettingInheritedPropertyByContext() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doGetInheritedPropertyByContext();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting the propertySet inherited from ExtensibleControl from a subcontrol instance
-     * The property is retrieved via control context.
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("checkin")
-    public void testGettingInheritedPropertyByContext2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
-				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doGetInheritedPropertyByContext();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting an inherited property from a subcontrol instance.
-     * The property is retrieved via getter.
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testGettingInheritedPropertyByGetter() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doGetInheritedPropertyByGetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests getting an inherited property from a subcontrol instance
-     * The property is retrieved via getter.
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testGettingInheritedPropertyByGetter2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doGetInheritedPropertyByGetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests setting an inherited property from a subcontrol instance.
-     * The property is retrieved via getter.
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testSettingInheritedPropertyBySetter() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doSetInheritedPropertyBySetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests setting an inherited property from a subcontrol instance
-     * The property is retrieved via getter.
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testSettingInheritedPropertyBySetter2() throws Exception
-    {
-
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doSetInheritedPropertyBySetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-
-    /**
-     * Tests getting the reconfigured and inherited property.(A property declared on super control,
-     * but reconfigured on sub control)
-     * The reset property is retrieve by context.
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testGetReconfiguredPropertyByContext() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doGetReconfiguredPropertyByContext();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting the reconfigured and inherited property.(A property declared on super control,
-     * but reconfigured on sub control)
-     * The reset property is retrieve by context.
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testGetReconfiguredPropertyByContext2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
-				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doGetReconfiguredPropertyByContext();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting a reconfigured inherited property.(The property is declared on super control
-     * but reconfigured on sub control interface).
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testGetReconfiguredPropertyByGetter() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doGetReconfiguredPropertyByGetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests getting a reconfigured inherited property.(The property is declared on super control
-     * but reconfigured on sub control interface).
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testGetReconfiguredPropertyByGetter2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doGetReconfiguredPropertyByGetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests setting the reconfigured and inherited property using bean setter
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testSetReconfiguredPropertyBySetter() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doSetReconfiguredPropertyBySetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-	 * Tests setting the reconfigured and inherited property using bean setter
-	 * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testSetReconfiguredPropertyBySetter2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doSetReconfiguredPropertyBySetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-
-	/* More tests to be added on getting property value reconfigured on subcontrol
-	 * by declaration.
-	 * The above tests testGetReconfiguredPropertyByContext(2) gets the value using an
-	 * inherited method.
-	 * Once testExtendedMethod passes, we need to add one or two tests to
-	 * get the reconfigured value using an extended method on subcontrol
-	 *
-	 * Like: testGetReconfigurePropertyBySubImpl
-	 * While the above two methods are really: testGetReconfiguredPropertyBySuperImpl
-	 */
-
-    /**
-     * Tests getting the property declared on SubControl interface.
-     * The value is retrieved by control context.
-     * The subcontrol is instantiated declaratively.
-     */
-	@Freq("detailed")
-    public void testGetExtendedPropertyByContext() throws Exception
-    {
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doGetExtendedPropertyByContext();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting the property declared on SubControl interface.
-     * The property is retrieved by control context.
-     * The subcontrol is instantiated programmatically.
-     */
-	@Freq("checkin")
-    public void testGetExtendedPropertyByContext2() throws Exception
-    {
-
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doGetExtendedPropertyByContext();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Tests getting the property declared SubControl interface.
-     * The value is retrieved by getter on subcontrol bean
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testGetExtendedPropertyByGetter() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doGetExtendedPropertyByGetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests getting the property declared on SubControl interface
-	 * The value is retrieved by getter on the subcontrol bean.
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testGetExtendedPropertyByGetter2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doGetExtendedPropertyByGetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests setting the property declared SubControl interface.
-     * The value is changed by setter on subcontrol bean
-     * The subcontrol is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testSetExtendedPropertyBySetter() throws Exception
-    {
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(subcontrol);
-		report=driver.doSetExtendedPropertyBySetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Tests setting the property declared on SubControl interface
-	 * The value is changed by setter on the subcontrol bean.
-     * The subcontrol is instantiated programmatically
-     */
-	@Freq("detailed")
-    public void testSetExtendedPropertyBySetter2() throws Exception
-    {
-		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
-			Thread.currentThread().getContextClassLoader() ,
-			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
-
-		Report report =new Report();
-		DriveSubControl driver=new DriveSubControl();
-		driver.setControl(sub);
-		report=driver.doSetExtendedPropertyBySetter();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-
-    /**
-     * Invokes a method overwritten by subcontrol
-     */
-	@Freq("detailed")
-	@Status("inactive")
-    public void testOverwrittenMethod() throws Exception
-    {
-		//to be implemented depending on development status
-    }
-
-}
+/*
+ * 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.extension;
+
+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.extension.SubControlBean;
+import org.apache.beehive.controls.test.driver.extension.DriveSubControl;
+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 TeseCase that tests control inheritance by instantiating a subcontrol and invoking the methods
+ * and getting/setting the properties.
+ * All tests on controls instantiated declaratively are deactivated until this feature is supported.
+ */
+public class SubControlTest extends TestCase
+{
+
+    //Start of unique client programming to instantiate controls declaratively in java container
+    private TestBeanContext _testContext;
+
+    public SubControlTest(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 extending ExtensibleControl in the same package
+     */
+    @Control
+    public SubControlBean subcontrol;
+
+    /**
+     * Tests getting/setting a property declared on super control interface
+	 * that is annotated with @Inherited
+     */
+	@Freq("detailed")
+    public void testAnnotatedInheritedProperty() throws Exception
+    {
+		String theBirthplace=subcontrol.getBirthplace();
+
+		if (theBirthplace==null)
+			fail("The property annotated with @Inherited is NULL");
+		else{
+			if (theBirthplace.equals("ExtensibleControl")){
+				subcontrol.setBirthplace("JUNIT");
+				String resetValue=subcontrol.getAnnotatedInheritedPropertyByContext();
+				if (!resetValue.equals("JUNIT"))
+					fail("Reset value of the annotated inherited property is incorrect:"+resetValue);
+			}
+			else
+				fail("The property annotated with @Inherited has an incorrect value:"+theBirthplace);
+		}
+    }
+
+
+    /**
+     * Tests invoking a method inherited by the subcontrol
+     */
+	@Freq("detailed")
+    public void testInheritedMethod() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doInvokeInheritedMethod();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests invoking a method inherited by the subcontrol.
+     * The subcontrol is instantiated programmically
+     */
+	@Freq("checkin")
+    public void testInheritedMethod2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
+				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doInvokeInheritedMethod();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests invoking a method declared on the subcontrol
+     */
+	@Freq("detailed")
+    public void testExtendedMethod() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doInvokeExtendedMethod();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests invoking a method declared on the subcontrol
+     * The subcontrol is instantiated programmically
+     */
+	@Freq("checkin")
+    public void testExtendedMethod2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
+				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doInvokeExtendedMethod();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting propertySet inherited from ExtensibleControl from a subcontrol instance.
+     * The property is retrieved via control context.
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+	@Status("inactive")
+    public void testGettingInheritedPropertyByContext() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doGetInheritedPropertyByContext();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting the propertySet inherited from ExtensibleControl from a subcontrol instance
+     * The property is retrieved via control context.
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("checkin")
+    public void testGettingInheritedPropertyByContext2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
+				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doGetInheritedPropertyByContext();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting an inherited property from a subcontrol instance.
+     * The property is retrieved via getter.
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testGettingInheritedPropertyByGetter() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doGetInheritedPropertyByGetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests getting an inherited property from a subcontrol instance
+     * The property is retrieved via getter.
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testGettingInheritedPropertyByGetter2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doGetInheritedPropertyByGetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests setting an inherited property from a subcontrol instance.
+     * The property is retrieved via getter.
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testSettingInheritedPropertyBySetter() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doSetInheritedPropertyBySetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests setting an inherited property from a subcontrol instance
+     * The property is retrieved via getter.
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testSettingInheritedPropertyBySetter2() throws Exception
+    {
+
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doSetInheritedPropertyBySetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+
+    /**
+     * Tests getting the reconfigured and inherited property.(A property declared on super control,
+     * but reconfigured on sub control)
+     * The reset property is retrieve by context.
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testGetReconfiguredPropertyByContext() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doGetReconfiguredPropertyByContext();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting the reconfigured and inherited property.(A property declared on super control,
+     * but reconfigured on sub control)
+     * The reset property is retrieve by context.
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testGetReconfiguredPropertyByContext2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
+				"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doGetReconfiguredPropertyByContext();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting a reconfigured inherited property.(The property is declared on super control
+     * but reconfigured on sub control interface).
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testGetReconfiguredPropertyByGetter() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doGetReconfiguredPropertyByGetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests getting a reconfigured inherited property.(The property is declared on super control
+     * but reconfigured on sub control interface).
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testGetReconfiguredPropertyByGetter2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doGetReconfiguredPropertyByGetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests setting the reconfigured and inherited property using bean setter
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testSetReconfiguredPropertyBySetter() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doSetReconfiguredPropertyBySetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+	 * Tests setting the reconfigured and inherited property using bean setter
+	 * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testSetReconfiguredPropertyBySetter2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doSetReconfiguredPropertyBySetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+
+	/* More tests to be added on getting property value reconfigured on subcontrol
+	 * by declaration.
+	 * The above tests testGetReconfiguredPropertyByContext(2) gets the value using an
+	 * inherited method.
+	 * Once testExtendedMethod passes, we need to add one or two tests to
+	 * get the reconfigured value using an extended method on subcontrol
+	 *
+	 * Like: testGetReconfigurePropertyBySubImpl
+	 * While the above two methods are really: testGetReconfiguredPropertyBySuperImpl
+	 */
+
+    /**
+     * Tests getting the property declared on SubControl interface.
+     * The value is retrieved by control context.
+     * The subcontrol is instantiated declaratively.
+     */
+	@Freq("detailed")
+    public void testGetExtendedPropertyByContext() throws Exception
+    {
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doGetExtendedPropertyByContext();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting the property declared on SubControl interface.
+     * The property is retrieved by control context.
+     * The subcontrol is instantiated programmatically.
+     */
+	@Freq("checkin")
+    public void testGetExtendedPropertyByContext2() throws Exception
+    {
+
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doGetExtendedPropertyByContext();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Tests getting the property declared SubControl interface.
+     * The value is retrieved by getter on subcontrol bean
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testGetExtendedPropertyByGetter() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doGetExtendedPropertyByGetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests getting the property declared on SubControl interface
+	 * The value is retrieved by getter on the subcontrol bean.
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testGetExtendedPropertyByGetter2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doGetExtendedPropertyByGetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests setting the property declared SubControl interface.
+     * The value is changed by setter on subcontrol bean
+     * The subcontrol is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testSetExtendedPropertyBySetter() throws Exception
+    {
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(subcontrol);
+		report=driver.doSetExtendedPropertyBySetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Tests setting the property declared on SubControl interface
+	 * The value is changed by setter on the subcontrol bean.
+     * The subcontrol is instantiated programmatically
+     */
+	@Freq("detailed")
+    public void testSetExtendedPropertyBySetter2() throws Exception
+    {
+		SubControlBean sub=(SubControlBean)java.beans.Beans.instantiate(
+			Thread.currentThread().getContextClassLoader() ,
+			"org.apache.beehive.controls.test.controls.extension.SubControlBean");
+
+		Report report =new Report();
+		DriveSubControl driver=new DriveSubControl();
+		driver.setControl(sub);
+		report=driver.doSetExtendedPropertyBySetter();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+
+    /**
+     * Invokes a method overwritten by subcontrol
+     */
+	@Freq("detailed")
+	@Status("inactive")
+    public void testOverwrittenMethod() throws Exception
+    {
+		//to be implemented depending on development status
+    }
+
+}

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/generic/GenericTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/generic/SimpleControlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/BeanInfo.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/BeanInfo.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/Ext1Bean.beaninfo
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/Ext2Bean.beaninfo
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/InheritTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/Intf1Bean.beaninfo
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/inherit/Intf2Bean.beaninfo
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/overload/TestHello.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/overload/TestHello.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/overload/TestHello.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/overload/TestHello.java Fri Aug 12 08:12:28 2005
@@ -1,86 +1,86 @@
-/*
- * 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.overload;
-
-import junit.framework.TestCase;
-import java.beans.Beans;
-import java.lang.Integer;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.Controls;
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.overload.HelloControlBean;
-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 invoking overloaded methods on controls
- */
-public class TestHello extends TestCase
-{
-
-    //Start of unique client programming to instantiate controls declaratively in java container
-    private TestBeanContext _testContext;
-
-    public TestHello(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 with overloaded methods
-	 */
-    @Control
-    private HelloControlBean myHelloBean;
-
-    /**
-     * Tests invoking overloaded methods on a control
-     */
-	@Freq("detailed")
-    public void testOverload() throws Exception
-    {
-		String strResult=myHelloBean.hello("Good moring");
-		if (!strResult.equals("Good moring"))
-			fail("Inocking first method fails. returned value:"+strResult);
-		String strResult2=myHelloBean.hello(99);
-		if (!strResult2.equals(String.valueOf(99)))
-			fail("Inocking second method fails. returned value:"+strResult2);
-		boolean bytes[]={true,false,true,false};
-		String strResult3=myHelloBean.hello(bytes);
-		if (!strResult3.equals("truefalsetruefalse"))
-			fail("Inocking third method fails. returned value:"+strResult3);
-    }
-}
+/*
+ * 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.overload;
+
+import junit.framework.TestCase;
+import java.beans.Beans;
+import java.lang.Integer;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.bean.Controls;
+import org.apache.beehive.controls.api.bean.ControlBean;
+import org.apache.beehive.controls.test.controls.overload.HelloControlBean;
+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 invoking overloaded methods on controls
+ */
+public class TestHello extends TestCase
+{
+
+    //Start of unique client programming to instantiate controls declaratively in java container
+    private TestBeanContext _testContext;
+
+    public TestHello(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 with overloaded methods
+	 */
+    @Control
+    private HelloControlBean myHelloBean;
+
+    /**
+     * Tests invoking overloaded methods on a control
+     */
+	@Freq("detailed")
+    public void testOverload() throws Exception
+    {
+		String strResult=myHelloBean.hello("Good moring");
+		if (!strResult.equals("Good moring"))
+			fail("Inocking first method fails. returned value:"+strResult);
+		String strResult2=myHelloBean.hello(99);
+		if (!strResult2.equals(String.valueOf(99)))
+			fail("Inocking second method fails. returned value:"+strResult2);
+		boolean bytes[]={true,false,true,false};
+		String strResult3=myHelloBean.hello(bytes);
+		if (!strResult3.equals("truefalsetruefalse"))
+			fail("Inocking third method fails. returned value:"+strResult3);
+    }
+}

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/overload/TestHello.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/EventSetInfoTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/EventSetInfoTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/EventSetInfoTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/EventSetInfoTest.java Fri Aug 12 08:12:28 2005
@@ -1,58 +1,58 @@
-/*
- * 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.packaging;
-
-import junit.framework.TestCase;
-import org.apache.beehive.controls.test.driver.packaging.DriveEventSetInfo;
-import org.apache.beehive.test.tools.milton.common.Report;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
-
-/**
- * A TestCase that tests controls PropertyInfo
- *
- * PropertyInfo annotation on control interface is saved into controlBeanInfo class
- * when the control is packaged.
- *
- * The tests in this class get property info from controlBeanInfo class after the
- * control is packaged into jar, in order to verify this part of control packaging
- * process.
- */
-@Freq("detailed")
-public class EventSetInfoTest extends TestCase
-{
-    public EventSetInfoTest( String s ) { super( s ); }
-
-    public void setUp() { }
-
-	/*Test getting FeatureInfo from ControlBeanInfo class*/
-	@Freq("detailed")
-    public void testGetEventSetInfo() throws Exception
-    {
-		DriveEventSetInfo driver=new DriveEventSetInfo();
-
-		Report report=driver.doGetEventSetInfo();
-
-		String result=report.getStatus();
-
-		if (result.equals(Report.FAIL))
-			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.packaging;
+
+import junit.framework.TestCase;
+import org.apache.beehive.controls.test.driver.packaging.DriveEventSetInfo;
+import org.apache.beehive.test.tools.milton.common.Report;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+
+
+/**
+ * A TestCase that tests controls PropertyInfo
+ *
+ * PropertyInfo annotation on control interface is saved into controlBeanInfo class
+ * when the control is packaged.
+ *
+ * The tests in this class get property info from controlBeanInfo class after the
+ * control is packaged into jar, in order to verify this part of control packaging
+ * process.
+ */
+@Freq("detailed")
+public class EventSetInfoTest extends TestCase
+{
+    public EventSetInfoTest( String s ) { super( s ); }
+
+    public void setUp() { }
+
+	/*Test getting FeatureInfo from ControlBeanInfo class*/
+	@Freq("detailed")
+    public void testGetEventSetInfo() throws Exception
+    {
+		DriveEventSetInfo driver=new DriveEventSetInfo();
+
+		Report report=driver.doGetEventSetInfo();
+
+		String result=report.getStatus();
+
+		if (result.equals(Report.FAIL))
+			fail(report.getMessage());
+
+    }
+}

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/EventSetInfoTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/PropertyInfoTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/PropertyInfoTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/PropertyInfoTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/PropertyInfoTest.java Fri Aug 12 08:12:28 2005
@@ -1,58 +1,58 @@
-/*
- * 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.packaging;
-
-import junit.framework.TestCase;
-import org.apache.beehive.controls.test.driver.packaging.DrivePropertyInfo;
-import org.apache.beehive.test.tools.milton.common.Report;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
-
-/**
- * A TestCase that tests controls PropertyInfo
- *
- * PropertyInfo annotation on control interface is saved into controlBeanInfo class
- * when the control is packaged.
- *
- * The tests in this class get property info from controlBeanInfo class after the
- * control is packaged into jar, in order to verify this part of control packaging
- * process.
- */
-@Freq("detailed")
-public class PropertyInfoTest extends TestCase
-{
-    public PropertyInfoTest( String s ) { super( s ); }
-
-    public void setUp() { }
-
-	/*Test getting FeatureInfo from ControlBeanInfo class*/
-	@Freq("detailed")
-    public void testGetPropertyInfo() throws Exception
-    {
-		DrivePropertyInfo driver=new DrivePropertyInfo();
-
-		Report report=driver.doGetPropertyInfo();
-
-		String result=report.getStatus();
-
-		if (result.equals(Report.FAIL))
-			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.packaging;
+
+import junit.framework.TestCase;
+import org.apache.beehive.controls.test.driver.packaging.DrivePropertyInfo;
+import org.apache.beehive.test.tools.milton.common.Report;
+import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
+
+
+/**
+ * A TestCase that tests controls PropertyInfo
+ *
+ * PropertyInfo annotation on control interface is saved into controlBeanInfo class
+ * when the control is packaged.
+ *
+ * The tests in this class get property info from controlBeanInfo class after the
+ * control is packaged into jar, in order to verify this part of control packaging
+ * process.
+ */
+@Freq("detailed")
+public class PropertyInfoTest extends TestCase
+{
+    public PropertyInfoTest( String s ) { super( s ); }
+
+    public void setUp() { }
+
+	/*Test getting FeatureInfo from ControlBeanInfo class*/
+	@Freq("detailed")
+    public void testGetPropertyInfo() throws Exception
+    {
+		DrivePropertyInfo driver=new DrivePropertyInfo();
+
+		Report report=driver.doGetPropertyInfo();
+
+		String result=report.getStatus();
+
+		if (result.equals(Report.FAIL))
+			fail(report.getMessage());
+
+    }
+}

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/packaging/PropertyInfoTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java Fri Aug 12 08:12:28 2005
@@ -1,105 +1,105 @@
-/*
- * 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.PropertyControlBean;
-import org.apache.beehive.controls.test.driver.property.DriveGetters;
-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 accessing control's propertySet by control bean's getter/setter
- */
-
-public class ClientAccessTest extends TestCase
-{
-    //Start of unique client programming to instantiate controls declaratively in java container
-    private TestBeanContext _testContext;
-
-    public ClientAccessTest(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 propertySet in its control interface
-	 */
-    @Control
-    public PropertyControlBean myControl;
-
-    /**
-     * Accesses property value by getter of the control bean instance.
-     * The ccontrol bean is instantiated declaratively
-     */
-	@Freq("detailed")
-    public void testGetterByDeclare() throws Exception
-    {
-		Report report=new Report();
-		DriveGetters driver=new DriveGetters();
-		driver.setControl(myControl);
-		report=driver.doTest();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-
-    }
-
-    /**
-     * Accesses property value by getter og control bean instance.
-     * The control bean is instantiated programmatically
-     */
-	@Freq("checkin")
-    public void testGetterByProgram() throws Exception
-    {
-		Report report=new Report();
-		PropertyControlBean sbean=(PropertyControlBean)Beans.instantiate(
-			Thread.currentThread().getContextClassLoader(),
-            "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
-		DriveGetters driver=new DriveGetters();
-		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.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.PropertyControlBean;
+import org.apache.beehive.controls.test.driver.property.DriveGetters;
+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 accessing control's propertySet by control bean's getter/setter
+ */
+
+public class ClientAccessTest extends TestCase
+{
+    //Start of unique client programming to instantiate controls declaratively in java container
+    private TestBeanContext _testContext;
+
+    public ClientAccessTest(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 propertySet in its control interface
+	 */
+    @Control
+    public PropertyControlBean myControl;
+
+    /**
+     * Accesses property value by getter of the control bean instance.
+     * The ccontrol bean is instantiated declaratively
+     */
+	@Freq("detailed")
+    public void testGetterByDeclare() throws Exception
+    {
+		Report report=new Report();
+		DriveGetters driver=new DriveGetters();
+		driver.setControl(myControl);
+		report=driver.doTest();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+
+    }
+
+    /**
+     * Accesses property value by getter og control bean instance.
+     * The control bean is instantiated programmatically
+     */
+	@Freq("checkin")
+    public void testGetterByProgram() throws Exception
+    {
+		Report report=new Report();
+		PropertyControlBean sbean=(PropertyControlBean)Beans.instantiate(
+			Thread.currentThread().getContextClassLoader(),
+            "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
+		DriveGetters driver=new DriveGetters();
+		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/ClientAccessTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientImplTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientImplTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientImplTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientImplTest.java Fri Aug 12 08:12:28 2005
@@ -1,121 +1,121 @@
-/*
- * 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.basic.Hello;
-import org.apache.beehive.controls.test.controls.basic.HelloBean;
-import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
-import org.apache.beehive.controls.test.driver.property.DriveSetters;
-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 control's propertySet by both impl and client
- */
-
-public class ClientImplTest extends TestCase
-{
-    //Start of unique client programming to instantiate controls declaratively in java container
-    private TestBeanContext _testContext;
-
-    public ClientImplTest(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
-	 */
-    @Control
-    public PropertyControlBean myControl;
-
-    @Control
-    public HelloBean myHelloControl;
-
-    /**
-     * Resets control's property value using setters on the bean class and
-     * retrieves the new value using control context on control's impl.
-     * This method instantiates HelloBean by declaration
-     */
-	@Freq("detailed")
-    public void testResetPropertyByDeclare() throws Exception
-    {
-		Report report=new Report();
-		DriveSetters driver=new DriveSetters();
-		driver.setControl(myControl);
-		report=driver.doTest();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-     * Resets control's property value using setters on the bean class and
-     * retrieves the new value using control context on control's impl.
-     * This method instantiates HelloBean by program
-     */
-	@Freq("checkin")
-    public void testResetPropertyByProgram() throws Exception
-    {
-		Report report=new Report();
-		PropertyControlBean sbean=(PropertyControlBean)Beans.instantiate(
-			Thread.currentThread().getContextClassLoader(),
-            "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
-		DriveSetters driver=new DriveSetters();
-		driver.setControl(sbean);
-		report=driver.doTest();
-		String result=report.getStatus();
-		if (!result.equals(Report.PASS))
-			fail(report.getMessage());
-    }
-
-    /**
-	 * Verifies the fix of JIRA-149
-     */
-	@Freq("detailed")
-    public void testHelloControl() throws Exception
-    {
-		Hello.Gender theGender=myHelloControl.getGender();
-		if (!theGender.value().equals(Hello.GenderType.NEUTRAL))
-			fail("Gender is Wrong");
-    }
-
-}
+/*
+ * 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.basic.Hello;
+import org.apache.beehive.controls.test.controls.basic.HelloBean;
+import org.apache.beehive.controls.test.controls.property.PropertyControlBean;
+import org.apache.beehive.controls.test.driver.property.DriveSetters;
+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 control's propertySet by both impl and client
+ */
+
+public class ClientImplTest extends TestCase
+{
+    //Start of unique client programming to instantiate controls declaratively in java container
+    private TestBeanContext _testContext;
+
+    public ClientImplTest(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
+	 */
+    @Control
+    public PropertyControlBean myControl;
+
+    @Control
+    public HelloBean myHelloControl;
+
+    /**
+     * Resets control's property value using setters on the bean class and
+     * retrieves the new value using control context on control's impl.
+     * This method instantiates HelloBean by declaration
+     */
+	@Freq("detailed")
+    public void testResetPropertyByDeclare() throws Exception
+    {
+		Report report=new Report();
+		DriveSetters driver=new DriveSetters();
+		driver.setControl(myControl);
+		report=driver.doTest();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+     * Resets control's property value using setters on the bean class and
+     * retrieves the new value using control context on control's impl.
+     * This method instantiates HelloBean by program
+     */
+	@Freq("checkin")
+    public void testResetPropertyByProgram() throws Exception
+    {
+		Report report=new Report();
+		PropertyControlBean sbean=(PropertyControlBean)Beans.instantiate(
+			Thread.currentThread().getContextClassLoader(),
+            "org.apache.beehive.controls.test.controls.property.PropertyControlBean");
+		DriveSetters driver=new DriveSetters();
+		driver.setControl(sbean);
+		report=driver.doTest();
+		String result=report.getStatus();
+		if (!result.equals(Report.PASS))
+			fail(report.getMessage());
+    }
+
+    /**
+	 * Verifies the fix of JIRA-149
+     */
+	@Freq("detailed")
+    public void testHelloControl() throws Exception
+    {
+		Hello.Gender theGender=myHelloControl.getGender();
+		if (!theGender.value().equals(Hello.GenderType.NEUTRAL))
+			fail("Gender is Wrong");
+    }
+
+}

Propchange: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native