You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/05/13 00:35:15 UTC
svn commit: r405908 - in /beehive/trunk/controls:
src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/
src/runtime/org/apache/beehive/controls/runtime/webcontext/
test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontext...
Author: cschoett
Date: Fri May 12 15:35:12 2006
New Revision: 405908
URL: http://svn.apache.org/viewcvs?rev=405908&view=rev
Log:
Moved the o.a.b.c.r.b.webcontext package to o.a.b.c.r.webcontext. Updated supporting tests and classes.
Added:
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java (contents, props changed)
- copied, changed from r400169, beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextChildSupport.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java (contents, props changed)
- copied, changed from r400169, beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextServicesSupport.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java (contents, props changed)
- copied, changed from r400169, beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextSupport.java
Removed:
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextChildSupport.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextServicesSupport.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextSupport.java
Modified:
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChild.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChildNoServiceRelease.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextChildSupportTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextServicesSupportTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextSupportTest.java
Copied: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java (from r400169, beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextChildSupport.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java?p2=beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java&p1=beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextChildSupport.java&r1=400169&r2=405908&rev=405908&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextChildSupport.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java Fri May 12 15:35:12 2006
@@ -16,7 +16,7 @@
* $Header:$
*/
-package org.apache.beehive.controls.runtime.bean.webcontext;
+package org.apache.beehive.controls.runtime.webcontext;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
Propchange: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextChildSupport.java
------------------------------------------------------------------------------
svn:executable = *
Copied: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java (from r400169, beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextServicesSupport.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java?p2=beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java&p1=beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextServicesSupport.java&r1=400169&r2=405908&rev=405908&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextServicesSupport.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java Fri May 12 15:35:12 2006
@@ -16,7 +16,7 @@
* $Header:$
*/
-package org.apache.beehive.controls.runtime.bean.webcontext;
+package org.apache.beehive.controls.runtime.webcontext;
import java.beans.beancontext.BeanContext;
import java.beans.beancontext.BeanContextChild;
Propchange: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextServicesSupport.java
------------------------------------------------------------------------------
svn:executable = *
Copied: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java (from r400169, beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextSupport.java)
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java?p2=beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java&p1=beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextSupport.java&r1=400169&r2=405908&rev=405908&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/webcontext/ControlBeanContextSupport.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java Fri May 12 15:35:12 2006
@@ -16,7 +16,7 @@
* $Header:$
*/
-package org.apache.beehive.controls.runtime.bean.webcontext;
+package org.apache.beehive.controls.runtime.webcontext;
import java.beans.Beans;
import java.beans.PropertyChangeEvent;
Propchange: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/webcontext/ControlBeanContextSupport.java
------------------------------------------------------------------------------
svn:executable = *
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChild.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChild.java?rev=405908&r1=405907&r2=405908&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChild.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChild.java Fri May 12 15:35:12 2006
@@ -18,8 +18,6 @@
package org.apache.beehive.controls.test.controls.beancontextservices;
-import org.apache.beehive.controls.runtime.bean.webcontext.ControlBeanContextChildSupport;
-
import java.beans.beancontext.BeanContextServiceAvailableEvent;
import java.beans.beancontext.BeanContextServiceRevokedEvent;
import java.beans.beancontext.BeanContextServices;
@@ -30,7 +28,7 @@
* gets a reference to that service. Must be regestered manually as
* ServicesSupport listener.
*/
-public class BCChild extends ControlBeanContextChildSupport {
+public class BCChild extends org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport {
private transient int _refCount = 0;
private transient Object _service = null;
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChildNoServiceRelease.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChildNoServiceRelease.java?rev=405908&r1=405907&r2=405908&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChildNoServiceRelease.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/beancontextservices/BCChildNoServiceRelease.java Fri May 12 15:35:12 2006
@@ -18,8 +18,6 @@
package org.apache.beehive.controls.test.controls.beancontextservices;
-import org.apache.beehive.controls.runtime.bean.webcontext.ControlBeanContextChildSupport;
-
import java.beans.beancontext.BeanContextServiceAvailableEvent;
import java.beans.beancontext.BeanContextServiceRevokedEvent;
import java.beans.beancontext.BeanContextServices;
@@ -30,7 +28,7 @@
* gets a reference to that service. Must be regestered manually as
* ServicesSupport listener.
*/
-public class BCChildNoServiceRelease extends ControlBeanContextChildSupport {
+public class BCChildNoServiceRelease extends org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport {
private int _refCount = 0;
private Object _service = null;
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextChildSupportTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextChildSupportTest.java?rev=405908&r1=405907&r2=405908&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextChildSupportTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextChildSupportTest.java Fri May 12 15:35:12 2006
@@ -22,7 +22,7 @@
import org.apache.beehive.controls.test.controls.beancontextchild.DummyBeanContext;
import org.apache.beehive.controls.test.controls.beancontextchild.ChangeListener;
import org.apache.beehive.controls.test.controls.beancontextchild.AlwaysVetoListener;
-import org.apache.beehive.controls.runtime.bean.webcontext.ControlBeanContextChildSupport;
+import org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport;
import junit.framework.TestCase;
import java.beans.beancontext.BeanContext;
@@ -55,7 +55,7 @@
* the bean context with no listeners registered.
*/
public void testSetBeanContext_NoListeners() {
- ControlBeanContextChildSupport cbcChildSupport = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport cbcChildSupport = getContext();
assertNotNull(cbcChildSupport);
BeanContext bc = new DummyBeanContext();
@@ -76,7 +76,7 @@
*/
public void testSetBeanContext_PropertyChangeListener_Peer() {
BeanChildPeer bcp = new BeanChildPeer();
- ControlBeanContextChildSupport cbcChildSupport = new ControlBeanContextChildSupport(bcp);
+ ControlBeanContextChildSupport cbcChildSupport = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport(bcp);
ChangeListener cl1 = new ChangeListener();
cbcChildSupport.addPropertyChangeListener("beanContext", cl1);
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextServicesSupportTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextServicesSupportTest.java?rev=405908&r1=405907&r2=405908&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextServicesSupportTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextServicesSupportTest.java Fri May 12 15:35:12 2006
@@ -32,7 +32,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.beehive.controls.runtime.bean.webcontext.ControlBeanContextServicesSupport;
+import org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport;
import org.apache.beehive.controls.test.controls.beancontextservices.BCChild;
import org.apache.beehive.controls.test.controls.beancontextservices.BCChildNoServiceRelease;
import org.apache.beehive.controls.test.controls.beancontextservices.ServiceListener;
@@ -51,7 +51,7 @@
* Create a new ControlBeanContextServicesSupport.
*/
public void testCreateCBCSS() {
- ControlBeanContextServicesSupport _cbcsSupport = new ControlBeanContextServicesSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport _cbcsSupport = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport();
assertNotNull(_cbcsSupport);
}
@@ -78,7 +78,7 @@
* Add a service which already exists in ServicesSupport.
*/
public void testAddDuplicateService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl sp = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, sp));
assertTrue(cbcss.hasService(TestService.class));
@@ -109,7 +109,7 @@
*/
public void testAddServiceWithListener_Peer() {
ServicesBeanPeer sbp = new ServicesBeanPeer();
- ControlBeanContextServicesSupport cbcss = new ControlBeanContextServicesSupport(sbp);
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport(sbp);
ServiceListener sl = new ServiceListener();
cbcss.addBeanContextServicesListener(sl);
@@ -127,7 +127,7 @@
* Verify that a services listener can be removed.
*/
public void testRemoveServiceListenerTest() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
ServiceListener sl = new ServiceListener();
cbcss.addBeanContextServicesListener(sl);
cbcss.removeBeanContextServicesListener(sl);
@@ -143,7 +143,7 @@
* Test the revocation of a service which has no references to it.
*/
public void testRevokeService_NoReferences() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
@@ -168,7 +168,7 @@
*/
public void testRevokeService_NoReferences_Peer() {
ServicesBeanPeer sbp = new ServicesBeanPeer();
- ControlBeanContextServicesSupport cbcss = new ControlBeanContextServicesSupport(sbp);
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport(sbp);
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
@@ -215,7 +215,7 @@
* Test iterator over service classes.
*/
public void testGetCurrentServiceClasses() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
@@ -230,7 +230,7 @@
* expected behavior in this case is not to include service class in iterator.
*/
public void testGetCurrentServiceClasses_RevokedService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
cbcss.revokeService(TestService.class, service1, true);
@@ -243,7 +243,7 @@
* Test for the hasService() for api test completness.
*/
public void testHasService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
assertTrue(cbcss.hasService(TestService.class));
@@ -271,7 +271,7 @@
* Attempt to get a service with an invalid child.
*/
public void testGetService_IllegalChild() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
@@ -293,7 +293,7 @@
* to it.
*/
public void testGetService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
BCChild child = new BCChild();
assertTrue(cbcss.add(child));
cbcss.addBeanContextServicesListener(child);
@@ -311,7 +311,7 @@
* Verify that the release of a service worked.
*/
public void testReleaseService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
BCChild child = new BCChild();
assertTrue(cbcss.add(child));
cbcss.addBeanContextServicesListener(child);
@@ -335,7 +335,7 @@
* Revoke a service which has a reference which is not released on the revoke.
*/
public void testRevokeOnReferencedService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
BCChildNoServiceRelease child = new BCChildNoServiceRelease();
assertTrue(cbcss.add(child));
cbcss.addBeanContextServicesListener(child);
@@ -358,7 +358,7 @@
* verify that it no longer exists.
*/
public void testForceRevokeOnReferencedService() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
BCChildNoServiceRelease child = new BCChildNoServiceRelease();
assertTrue(cbcss.add(child));
cbcss.addBeanContextServicesListener(child);
@@ -387,7 +387,7 @@
public void testGetDelegatedService() {
// create the parent
- ControlBeanContextServicesSupport parent_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport parent_cbcss = getContext();
// create a child cbcss
ControlBeanContextServicesSupport child_cbcss = getContext();
@@ -417,10 +417,10 @@
public void testRevokeDelegateService() {
// create the parent
- ControlBeanContextServicesSupport parent_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport parent_cbcss = getContext();
// create a child cbcss
- ControlBeanContextServicesSupport child_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport child_cbcss = getContext();
assertTrue(parent_cbcss.add(child_cbcss));
// add a bcchild which will reqest the service as soon as its added to the top-most parent
@@ -455,10 +455,10 @@
public void testForcedRevokeOfDelegatedService() {
// create the parent
- ControlBeanContextServicesSupport parent_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport parent_cbcss = getContext();
// create a child cbcss
- ControlBeanContextServicesSupport child_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport child_cbcss = getContext();
assertTrue(parent_cbcss.add(child_cbcss));
// add a bcchild which will reqest the service as soon as its added to the top-most parent
@@ -494,7 +494,7 @@
* of a child which contains a reference to that service.
*/
public void testImplicitServiceRevoke() {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
// add a bcchild which will reqest the service as soon as its added
BCChild child = new BCChild();
@@ -529,7 +529,7 @@
*/
public void testReparentChild() {
// create the parent
- ControlBeanContextServicesSupport parent_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport parent_cbcss = getContext();
// create a child cbcss
ControlBeanContextServicesSupport child_cbcss = getContext();
@@ -580,7 +580,7 @@
ControlBeanContextServicesSupport parent_cbcss = getContext();
// create a child cbcss
- ControlBeanContextServicesSupport child_cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport child_cbcss = getContext();
assertTrue(parent_cbcss.add(child_cbcss));
// add a bcchild which will reqest the service as soon as its added to the top-most parent
@@ -628,7 +628,7 @@
*/
public void testSerializationEmptyBCS() throws IOException, ClassNotFoundException {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
cbcss.setDesignTime(true);
File serFile = serializeCBCSS(cbcss, "cbcss_1");
@@ -641,7 +641,7 @@
* Test Serialization with a service which is serializable.
*/
public void testSerializationWithService() throws IOException, ClassNotFoundException {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
TestBCServiceProviderImpl service1 = new TestBCServiceProviderImpl();
assertTrue(cbcss.addService(TestService.class, service1));
@@ -654,7 +654,7 @@
* Test serialization with a BeanContextServicesListener registered.
*/
public void testSerializationWithListeners() throws IOException, ClassNotFoundException {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
ServiceListener sl = new ServiceListener();
cbcss.addBeanContextServicesListener(sl);
@@ -674,7 +674,7 @@
* Test serialization with a non-serializable BeanContextServicesListener registered.
*/
public void testSerializationWithNonSerializableListeners() throws IOException, ClassNotFoundException {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
NonSerializableServiceListener sl = new NonSerializableServiceListener();
cbcss.addBeanContextServicesListener(sl);
@@ -709,7 +709,7 @@
* Test serialization with a child that has a reference to a service.
*/
public void testSerialziationWithChildReference() throws IOException, ClassNotFoundException {
- ControlBeanContextServicesSupport cbcss = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport cbcss = getContext();
BCChild child = new BCChild();
assertTrue(cbcss.add(child));
cbcss.addBeanContextServicesListener(child);
@@ -739,7 +739,7 @@
// helpers
//
- protected ControlBeanContextServicesSupport getContext() {
+ protected org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport getContext() {
return new ControlBeanContextServicesSupport();
}
@@ -770,7 +770,7 @@
private ControlBeanContextServicesSupport deserializeCBCSS(File serFile) throws IOException, ClassNotFoundException {
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(serFile));
try {
- return (ControlBeanContextServicesSupport) ois.readObject();
+ return (org.apache.beehive.controls.runtime.webcontext.ControlBeanContextServicesSupport) ois.readObject();
} finally {
ois.close();
serFile.delete();
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextSupportTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextSupportTest.java?rev=405908&r1=405907&r2=405908&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextSupportTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ControlBeanContextSupportTest.java Fri May 12 15:35:12 2006
@@ -34,8 +34,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.beehive.controls.runtime.bean.webcontext.ControlBeanContextChildSupport;
-import org.apache.beehive.controls.runtime.bean.webcontext.ControlBeanContextSupport;
+import org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport;
+import org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport;
import org.apache.beehive.controls.test.controls.beancontext.BeanContextProxyImpl;
import org.apache.beehive.controls.test.controls.beancontext.MembershipListener;
import org.apache.beehive.controls.test.controls.beancontext.VisibilityImpl;
@@ -72,7 +72,7 @@
* Test addAll() collection api.
*/
public void testAddAll() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
try {
cbcs.addAll(Collections.EMPTY_LIST);
@@ -87,7 +87,7 @@
* Test clear() collection api.
*/
public void testClear() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
try {
cbcs.clear();
@@ -133,9 +133,9 @@
* Test contains() collection api.
*/
public void testContains() {
- ControlBeanContextSupport cbcs = getContext();
- ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
- ControlBeanContextChildSupport child2 = new ControlBeanContextChildSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport child2 = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child1));
assertTrue(cbcs.contains(child1));
@@ -149,7 +149,7 @@
ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
ControlBeanContextChildSupport child2 = new ControlBeanContextChildSupport();
- ControlBeanContextChildSupport child3 = new ControlBeanContextChildSupport();
+ ControlBeanContextChildSupport child3 = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport();
assertTrue(cbcs.add(child1));
assertTrue(cbcs.add(child2));
@@ -168,7 +168,7 @@
*/
public void testIsEmpty() {
ControlBeanContextSupport cbcs = getContext();
- ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
+ ControlBeanContextChildSupport child = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport();
assertTrue(cbcs.isEmpty());
assertTrue(cbcs.add(child));
@@ -183,7 +183,7 @@
*/
public void testIterator() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child1));
@@ -216,7 +216,7 @@
* Test toArray() collection api.
*/
public void testToObjectArray() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child));
Object[] array = cbcs.toArray();
@@ -242,7 +242,7 @@
* Add a single child to the context, verify that all the proper events are generated.
*/
public void testAddSingleChild() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
MembershipListener ml = new MembershipListener();
cbcs.addBeanContextMembershipListener(ml);
@@ -277,7 +277,7 @@
*/
public void testAddSingleChild_Peer() {
BeanContextPeer bcp = new BeanContextPeer();
- ControlBeanContextSupport cbcs = new ControlBeanContextSupport(bcp);
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport(bcp);
MembershipListener ml = new MembershipListener();
cbcs.addBeanContextMembershipListener(ml);
@@ -306,7 +306,7 @@
* Add a child which implements the BeanContextProxy interface.
*/
public void testAddProxyChild() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
MembershipListener ml = new MembershipListener();
cbcs.addBeanContextMembershipListener(ml);
@@ -348,7 +348,7 @@
assertTrue(cbcs.add(child));
assertTrue(child.getCanUseGui());
- cbcs = new ControlBeanContextSupport();
+ cbcs = new org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport();
cbcs.dontUseGui();
assertTrue(cbcs.add(child));
assertFalse(child.getCanUseGui());
@@ -358,8 +358,8 @@
* Attempt to re-add an existing child.
*/
public void testAddExistingChild() {
- ControlBeanContextSupport cbcs = getContext();
- ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child));
assertFalse(cbcs.add(child));
@@ -369,7 +369,7 @@
* Add a child who veto's its add to the bean context.
*/
public void testAddChildWhoVetos() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
AlwaysVetoListener avl = new AlwaysVetoListener();
child.addVetoableChangeListener("beanContext", avl);
@@ -469,7 +469,7 @@
*/
public void testImplicitRemoveSingleChild() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
// add the child
@@ -514,7 +514,7 @@
*/
public void testImplicitRemoveSingleChild_Peer() {
BeanContextPeer bcp = new BeanContextPeer();
- ControlBeanContextSupport cbcs = new ControlBeanContextSupport(bcp);
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = new ControlBeanContextSupport(bcp);
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
// add the child
@@ -560,7 +560,7 @@
* Remove a child which is not currently a child of the bean context.
*/
public void testRemoveNonExistentChild() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
assertFalse(cbcs.remove(child));
@@ -636,7 +636,7 @@
* Test the getResource() BeanContext API.
*/
public void testGetResource() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child));
@@ -649,7 +649,7 @@
* Test the getResource() BeanContext API, where the child parameter is not a child of the BeanContext.
*/
public void testGetResourceBadChild() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
try {
cbcs.getResource("org/apache/beehive/controls/test/controls/beancontext/Resource.txt", child);
@@ -679,7 +679,7 @@
*/
public void testGetResourceAsStreamBadChild() {
ControlBeanContextSupport cbcs = getContext();
- ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport child = new ControlBeanContextChildSupport();
try {
cbcs.getResourceAsStream("org/apache/beehive/controls/test/controls/beancontext/Resource.txt", child);
@@ -698,7 +698,7 @@
* Add a child which needGui, verify that it is picked up correctly.
*/
public void testNeedsGui() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
VisibilityImpl child = new VisibilityImpl();
child.setNeedsGui(true);
@@ -710,7 +710,7 @@
* Test the negative case of needsGui() Visiblity API.
*/
public void testNeedsGuiNegative() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
VisibilityImpl child = new VisibilityImpl();
child.setNeedsGui(false);
@@ -746,7 +746,7 @@
* Test the avoidingGui Visibility API.
*/
public void testAvoidingGui() {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
VisibilityImpl child = new VisibilityImpl();
child.setNeedsGui(true);
@@ -798,7 +798,7 @@
public void testSerializationWithChildren_Peer() throws IOException, ClassNotFoundException {
BeanContextPeer bcp = new BeanContextPeer();
ControlBeanContextSupport cbcs = new ControlBeanContextSupport(bcp);
- ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
ControlBeanContextChildSupport child2 = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child1));
@@ -821,7 +821,7 @@
ChangeListener cl1 = new ChangeListener();
child1.addPropertyChangeListener("beanContext", cl1);
- ControlBeanContextChildSupport child2 = new ControlBeanContextChildSupport();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextChildSupport child2 = new ControlBeanContextChildSupport();
ChangeListener cl2 = new ChangeListener();
child2.addPropertyChangeListener("beanContext", cl2);
@@ -861,7 +861,7 @@
* Test serialization with a child which is not serializable.
*/
public void testSerializationWithNonSerializableChild() throws IOException, ClassNotFoundException {
- ControlBeanContextSupport cbcs = getContext();
+ org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport cbcs = getContext();
ControlBeanContextChildSupport child1 = new ControlBeanContextChildSupport();
assertTrue(cbcs.add(child1));
VisibilityImpl child2 = new VisibilityImpl();
@@ -878,7 +878,7 @@
//
// helper methods
//
- protected ControlBeanContextSupport getContext() {
+ protected org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport getContext() {
return new ControlBeanContextSupport();
}
@@ -890,7 +890,7 @@
return serFile;
}
- private ControlBeanContextSupport deserializeCBCS(File serFile) throws IOException, ClassNotFoundException {
+ private org.apache.beehive.controls.runtime.webcontext.ControlBeanContextSupport deserializeCBCS(File serFile) throws IOException, ClassNotFoundException {
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(serFile));
try {
return (ControlBeanContextSupport) ois.readObject();