You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/09/21 18:00:56 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/observed TestObservedBuffer.java TestObservedBag.java ObservedTestHelper.java TestObservedCollection.java TestObservedSet.java TestObservedList.java
scolebourne 2003/09/21 09:00:56
Modified: collections/src/test/org/apache/commons/collections/observed
TestObservedBuffer.java TestObservedBag.java
ObservedTestHelper.java TestObservedCollection.java
TestObservedSet.java TestObservedList.java
Log:
Rename Observed to Observable
Revision Changes Path
1.2 +9 -9 jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedBuffer.java
Index: TestObservedBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedBuffer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestObservedBuffer.java 7 Sep 2003 16:50:59 -0000 1.1
+++ TestObservedBuffer.java 21 Sep 2003 16:00:55 -0000 1.2
@@ -69,7 +69,7 @@
/**
* Extension of {@link TestCollection} for exercising the
- * {@link ObservedBuffer} implementation.
+ * {@link ObservableBuffer} implementation.
*
* @since Commons Collections 3.0
* @version $Revision$ $Date$
@@ -103,13 +103,13 @@
}
public Collection makeCollection() {
- return ObservedBuffer.decorate(new ArrayStack(), ObservedTestHelper.LISTENER);
+ return ObservableBuffer.decorate(new ArrayStack(), ObservedTestHelper.LISTENER);
}
protected Collection makeFullCollection() {
List stack = new ArrayStack();
stack.addAll(Arrays.asList(getFullElements()));
- return ObservedBuffer.decorate(stack, ObservedTestHelper.LISTENER);
+ return ObservableBuffer.decorate(stack, ObservedTestHelper.LISTENER);
}
//-----------------------------------------------------------------------
@@ -118,12 +118,12 @@
}
//-----------------------------------------------------------------------
- public ObservedCollection createObservedCollection() {
- return ObservedBuffer.decorate(new ArrayStack());
+ public ObservableCollection createObservedCollection() {
+ return ObservableBuffer.decorate(new ArrayStack());
}
- public ObservedCollection createObservedCollection(Object listener) {
- return ObservedBuffer.decorate(new ArrayStack(), listener);
+ public ObservableCollection createObservedCollection(Object listener) {
+ return ObservableBuffer.decorate(new ArrayStack(), listener);
}
}
1.2 +8 -8 jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedBag.java
Index: TestObservedBag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedBag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestObservedBag.java 3 Sep 2003 23:54:25 -0000 1.1
+++ TestObservedBag.java 21 Sep 2003 16:00:55 -0000 1.2
@@ -66,7 +66,7 @@
/**
* Extension of {@link TestBag} for exercising the
- * {@link ObservedBag} implementation.
+ * {@link ObservableBag} implementation.
*
* @since Commons Collections 3.0
* @version $Revision$ $Date$
@@ -90,7 +90,7 @@
//-----------------------------------------------------------------------
public Bag makeBag() {
- return ObservedBag.decorate(new HashBag(), ObservedTestHelper.LISTENER);
+ return ObservableBag.decorate(new HashBag(), ObservedTestHelper.LISTENER);
}
//-----------------------------------------------------------------------
@@ -99,12 +99,12 @@
}
//-----------------------------------------------------------------------
- public ObservedCollection createObservedCollection() {
- return ObservedBag.decorate(new HashBag());
+ public ObservableCollection createObservedCollection() {
+ return ObservableBag.decorate(new HashBag());
}
- public ObservedCollection createObservedCollection(Object listener) {
- return ObservedBag.decorate(new HashBag(), listener);
+ public ObservableCollection createObservedCollection(Object listener) {
+ return ObservableBag.decorate(new HashBag(), listener);
}
}
1.8 +43 -43 jakarta-commons/collections/src/test/org/apache/commons/collections/observed/ObservedTestHelper.java
Index: ObservedTestHelper.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/observed/ObservedTestHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ObservedTestHelper.java 20 Sep 2003 12:13:59 -0000 1.7
+++ ObservedTestHelper.java 21 Sep 2003 16:00:55 -0000 1.8
@@ -121,8 +121,8 @@
}
public static interface ObservedFactory {
- ObservedCollection createObservedCollection();
- ObservedCollection createObservedCollection(Object listener);
+ ObservableCollection createObservedCollection();
+ ObservableCollection createObservedCollection(Object listener);
}
public static final Listener LISTENER = new Listener();
@@ -157,17 +157,17 @@
}
public static void bulkTestObservedSet(ObservedFactory factory) {
- Assert.assertTrue(factory.createObservedCollection() instanceof ObservedSet);
- Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservedSet);
- Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservedSet);
+ Assert.assertTrue(factory.createObservedCollection() instanceof ObservableSet);
+ Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservableSet);
+ Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservableSet);
bulkTestObservedCollection(factory);
}
public static void bulkTestObservedList(ObservedFactory factory) {
- Assert.assertTrue(factory.createObservedCollection() instanceof ObservedList);
- Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservedList);
- Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservedList);
+ Assert.assertTrue(factory.createObservedCollection() instanceof ObservableList);
+ Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservableList);
+ Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservableList);
bulkTestObservedCollection(factory);
doTestAddIndexed(factory);
@@ -181,9 +181,9 @@
}
public static void bulkTestObservedBag(ObservedFactory factory) {
- Assert.assertTrue(factory.createObservedCollection() instanceof ObservedBag);
- Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservedBag);
- Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservedBag);
+ Assert.assertTrue(factory.createObservedCollection() instanceof ObservableBag);
+ Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservableBag);
+ Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservableBag);
bulkTestObservedCollection(factory);
doTestAddNCopies(factory);
@@ -191,9 +191,9 @@
}
public static void bulkTestObservedBuffer(ObservedFactory factory) {
- Assert.assertTrue(factory.createObservedCollection() instanceof ObservedBuffer);
- Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservedBuffer);
- Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservedBuffer);
+ Assert.assertTrue(factory.createObservedCollection() instanceof ObservableBuffer);
+ Assert.assertTrue(factory.createObservedCollection(LISTENER) instanceof ObservableBuffer);
+ Assert.assertTrue(factory.createObservedCollection(new StandardModificationHandler()) instanceof ObservableBuffer);
bulkTestObservedCollection(factory);
doTestRemoveNext(factory);
@@ -201,7 +201,7 @@
//-----------------------------------------------------------------------
public static void doTestFactoryPlain(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection();
+ ObservableCollection coll = factory.createObservedCollection();
Assert.assertNotNull(coll.getHandler());
Assert.assertEquals(StandardModificationHandler.class, coll.getHandler().getClass());
@@ -210,7 +210,7 @@
}
public static void doTestFactoryWithPreListener(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(PRE_LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(PRE_LISTENER);
Assert.assertNotNull(coll.getHandler());
Assert.assertEquals(StandardModificationHandler.class, coll.getHandler().getClass());
@@ -224,7 +224,7 @@
}
public static void doTestFactoryWithPostListener(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(POST_LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(POST_LISTENER);
Assert.assertNotNull(coll.getHandler());
Assert.assertEquals(StandardModificationHandler.class, coll.getHandler().getClass());
@@ -238,7 +238,7 @@
}
public static void doTestFactoryWithListener(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
Assert.assertNotNull(coll.getHandler());
Assert.assertEquals(StandardModificationHandler.class, coll.getHandler().getClass());
@@ -256,7 +256,7 @@
public static void doTestFactoryWithHandler(ObservedFactory factory) {
StandardModificationHandler handler = new StandardModificationHandler();
- ObservedCollection coll = factory.createObservedCollection(handler);
+ ObservableCollection coll = factory.createObservedCollection(handler);
Assert.assertNotNull(coll.getHandler());
Assert.assertSame(handler, coll.getHandler());
@@ -272,7 +272,7 @@
}
public static void doTestFactoryWithNull(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(null);
+ ObservableCollection coll = factory.createObservedCollection(null);
Assert.assertNotNull(coll.getHandler());
Assert.assertEquals(StandardModificationHandler.class, coll.getHandler().getClass());
@@ -282,7 +282,7 @@
//-----------------------------------------------------------------------
public static void doTestAddRemoveGetPreListeners(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection();
+ ObservableCollection coll = factory.createObservedCollection();
Assert.assertEquals(0, coll.getHandler().getPreModificationListeners().length);
coll.getHandler().addPreModificationListener(LISTENER);
@@ -313,7 +313,7 @@
}
public static void doTestAddRemoveGetPostListeners(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection();
+ ObservableCollection coll = factory.createObservedCollection();
Assert.assertEquals(0, coll.getHandler().getPostModificationListeners().length);
coll.getHandler().addPostModificationListener(LISTENER);
@@ -345,7 +345,7 @@
//-----------------------------------------------------------------------
public static void doTestAdd(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
LISTENER.preEvent = null;
LISTENER.postEvent = null;
@@ -387,7 +387,7 @@
Assert.assertEquals(false, LISTENER.postEvent.isTypeBulk());
// this isn't a full test, but...
- Assert.assertEquals(false, LISTENER.postEvent.getBaseCollection() instanceof ObservedCollection);
+ Assert.assertEquals(false, LISTENER.postEvent.getBaseCollection() instanceof ObservableCollection);
LISTENER.preEvent = null;
LISTENER.postEvent = null;
@@ -454,7 +454,7 @@
//-----------------------------------------------------------------------
public static void doTestAddIndexed(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -499,7 +499,7 @@
//-----------------------------------------------------------------------
public static void doTestAddNCopies(ObservedFactory factory) {
- ObservedBag coll = (ObservedBag) factory.createObservedCollection(LISTENER);
+ ObservableBag coll = (ObservableBag) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -544,7 +544,7 @@
//-----------------------------------------------------------------------
public static void doTestAddIterated(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -591,7 +591,7 @@
//-----------------------------------------------------------------------
public static void doTestAddAll(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
LISTENER.preEvent = null;
LISTENER.postEvent = null;
@@ -633,7 +633,7 @@
//-----------------------------------------------------------------------
public static void doTestAddAllIndexed(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -676,7 +676,7 @@
//-----------------------------------------------------------------------
public static void doTestClear(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -727,7 +727,7 @@
//-----------------------------------------------------------------------
public static void doTestRemove(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -780,7 +780,7 @@
//-----------------------------------------------------------------------
public static void doTestRemoveIndexed(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -823,7 +823,7 @@
//-----------------------------------------------------------------------
public static void doTestRemoveNCopies(ObservedFactory factory) {
- ObservedBag coll = (ObservedBag) factory.createObservedCollection(LISTENER);
+ ObservableBag coll = (ObservableBag) factory.createObservedCollection(LISTENER);
coll.add(SIX, 6);
coll.add(SEVEN, 7);
@@ -869,7 +869,7 @@
//-----------------------------------------------------------------------
public static void doTestRemoveNext(ObservedFactory factory) {
- ObservedBuffer coll = (ObservedBuffer) factory.createObservedCollection(LISTENER);
+ ObservableBuffer coll = (ObservableBuffer) factory.createObservedCollection(LISTENER);
coll.add(SIX);
coll.add(SEVEN);
@@ -914,7 +914,7 @@
//-----------------------------------------------------------------------
public static void doTestRemoveIterated(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -969,7 +969,7 @@
}
public static void doTestRemoveListIterated(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -1025,7 +1025,7 @@
//-----------------------------------------------------------------------
public static void doTestRemoveAll(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
coll.add(EIGHT);
coll.addAll(SIX_SEVEN_LIST);
@@ -1077,7 +1077,7 @@
//-----------------------------------------------------------------------
public static void doTestRetainAll(ObservedFactory factory) {
- ObservedCollection coll = factory.createObservedCollection(LISTENER);
+ ObservableCollection coll = factory.createObservedCollection(LISTENER);
coll.add(EIGHT);
coll.addAll(SIX_SEVEN_LIST);
@@ -1129,7 +1129,7 @@
//-----------------------------------------------------------------------
public static void doTestSetIndexed(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -1174,7 +1174,7 @@
//-----------------------------------------------------------------------
public static void doTestSetIterated(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
LISTENER.preEvent = null;
@@ -1222,7 +1222,7 @@
//-----------------------------------------------------------------------
public static void doTestSubList(ObservedFactory factory) {
- ObservedList coll = (ObservedList) factory.createObservedCollection(LISTENER);
+ ObservableList coll = (ObservableList) factory.createObservedCollection(LISTENER);
coll.addAll(SIX_SEVEN_LIST);
coll.add(EIGHT);
1.2 +8 -8 jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedCollection.java
Index: TestObservedCollection.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedCollection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestObservedCollection.java 3 Sep 2003 23:54:25 -0000 1.1
+++ TestObservedCollection.java 21 Sep 2003 16:00:56 -0000 1.2
@@ -103,13 +103,13 @@
}
public Collection makeCollection() {
- return ObservedCollection.decorate(new ArrayList(), ObservedTestHelper.LISTENER);
+ return ObservableCollection.decorate(new ArrayList(), ObservedTestHelper.LISTENER);
}
protected Collection makeFullCollection() {
List list = new ArrayList();
list.addAll(Arrays.asList(getFullElements()));
- return ObservedCollection.decorate(list, ObservedTestHelper.LISTENER);
+ return ObservableCollection.decorate(list, ObservedTestHelper.LISTENER);
}
//-----------------------------------------------------------------------
@@ -118,12 +118,12 @@
}
//-----------------------------------------------------------------------
- public ObservedCollection createObservedCollection() {
- return ObservedCollection.decorate(new ArrayList());
+ public ObservableCollection createObservedCollection() {
+ return ObservableCollection.decorate(new ArrayList());
}
- public ObservedCollection createObservedCollection(Object listener) {
- return ObservedCollection.decorate(new ArrayList(), listener);
+ public ObservableCollection createObservedCollection(Object listener) {
+ return ObservableCollection.decorate(new ArrayList(), listener);
}
// public void testFactoryWithMasks() {
1.2 +8 -8 jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedSet.java
Index: TestObservedSet.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestObservedSet.java 3 Sep 2003 23:54:25 -0000 1.1
+++ TestObservedSet.java 21 Sep 2003 16:00:56 -0000 1.2
@@ -92,13 +92,13 @@
//-----------------------------------------------------------------------
public Set makeEmptySet() {
- return ObservedSet.decorate(new HashSet(), ObservedTestHelper.LISTENER);
+ return ObservableSet.decorate(new HashSet(), ObservedTestHelper.LISTENER);
}
protected Set makeFullSet() {
Set set = new HashSet();
set.addAll(Arrays.asList(getFullElements()));
- return ObservedSet.decorate(set, ObservedTestHelper.LISTENER);
+ return ObservableSet.decorate(set, ObservedTestHelper.LISTENER);
}
//-----------------------------------------------------------------------
@@ -107,12 +107,12 @@
}
//-----------------------------------------------------------------------
- public ObservedCollection createObservedCollection() {
- return ObservedSet.decorate(new HashSet());
+ public ObservableCollection createObservedCollection() {
+ return ObservableSet.decorate(new HashSet());
}
- public ObservedCollection createObservedCollection(Object listener) {
- return ObservedSet.decorate(new HashSet(), listener);
+ public ObservableCollection createObservedCollection(Object listener) {
+ return ObservableSet.decorate(new HashSet(), listener);
}
}
1.2 +8 -8 jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedList.java
Index: TestObservedList.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/observed/TestObservedList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestObservedList.java 3 Sep 2003 23:54:25 -0000 1.1
+++ TestObservedList.java 21 Sep 2003 16:00:56 -0000 1.2
@@ -92,13 +92,13 @@
//-----------------------------------------------------------------------
public List makeEmptyList() {
- return ObservedList.decorate(new ArrayList(), ObservedTestHelper.LISTENER);
+ return ObservableList.decorate(new ArrayList(), ObservedTestHelper.LISTENER);
}
protected List makeFullList() {
List set = new ArrayList();
set.addAll(Arrays.asList(getFullElements()));
- return ObservedList.decorate(set, ObservedTestHelper.LISTENER);
+ return ObservableList.decorate(set, ObservedTestHelper.LISTENER);
}
//-----------------------------------------------------------------------
@@ -107,12 +107,12 @@
}
//-----------------------------------------------------------------------
- public ObservedCollection createObservedCollection() {
- return ObservedList.decorate(new ArrayList());
+ public ObservableCollection createObservedCollection() {
+ return ObservableList.decorate(new ArrayList());
}
- public ObservedCollection createObservedCollection(Object listener) {
- return ObservedList.decorate(new ArrayList(), listener);
+ public ObservableCollection createObservedCollection(Object listener) {
+ return ObservableList.decorate(new ArrayList(), listener);
}
}