scolebourne 2003/10/10 14:09:27
Modified: collections/src/test/org/apache/commons/collections
TestBidiMap.java
Log:
Fix tests to work properly on inverse map
Revision Changes Path
1.8 +24 -19
jakarta-commons/collections/src/test/org/apache/commons/collections/TestBidiMap.java
Index: TestBidiMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBidiMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestBidiMap.java 9 Oct 2003 20:21:32 -0000 1.7
+++ TestBidiMap.java 10 Oct 2003 21:09:27 -0000 1.8
@@ -66,22 +66,20 @@
* @version $Revision$ $Date$
*
* @author Matthew Hawthorne
+ * @author Stephen Colebourne
*/
public abstract class TestBidiMap extends AbstractTestMap {
// Test data.
- private static final Object KEY = "key1";
- private static final Object VALUE = "value1";
-
private static final Object[][] entriesKV =
new Object[][] {
- new Object[] { KEY, VALUE },
+ new Object[] { "key1", "value1" },
new Object[] { "key2", "value2" },
new Object[] { "key3", "value3" }
};
private static final Object[][] entriesVK =
new Object[][] {
- new Object[] { VALUE, KEY },
+ new Object[] { "value1", "key1" },
new Object[] { "value2", "key2" },
new Object[] { "value3", "key3" }
};
@@ -178,12 +176,13 @@
* This implementation checks the inverse map as well.
*/
protected void verify() {
- // verify inverse
- assertEquals(map.size(), ((BidiMap) map).inverseBidiMap().size());
-
- // verify fully
+ verifyInverse();
super.verify();
}
+
+ protected void verifyInverse() {
+ assertEquals(map.size(), ((BidiMap) map).inverseBidiMap().size());
+ }
// testGetKey
//-----------------------------------------------------------------------
@@ -270,11 +269,11 @@
//-----------------------------------------------------------------------
public void testBidiRemove() {
- remove(makeFullBidiMap(), KEY);
- remove(makeFullBidiMap().inverseBidiMap(), VALUE);
+ remove(makeFullBidiMap(), entries[0][0]);
+ remove(makeFullBidiMap().inverseBidiMap(), entries[0][1]);
- removeKey(makeFullBidiMap(), VALUE);
- removeKey(makeFullBidiMap().inverseBidiMap(), KEY);
+ removeKey(makeFullBidiMap(), entries[0][1]);
+ removeKey(makeFullBidiMap().inverseBidiMap(), entries[0][0]);
}
private final void remove(BidiMap map, Object key) {
@@ -291,8 +290,8 @@
//-----------------------------------------------------------------------
public void testBidiRemoveByKeySet() {
- removeByKeySet(makeFullBidiMap(), KEY, VALUE);
- removeByKeySet(makeFullBidiMap().inverseBidiMap(), VALUE, KEY);
+ removeByKeySet(makeFullBidiMap(), entries[0][0], entries[0][1]);
+ removeByKeySet(makeFullBidiMap().inverseBidiMap(), entries[0][1],
entries[0][0]);
}
private final void removeByKeySet(BidiMap map, Object key, Object value) {
@@ -311,8 +310,8 @@
//-----------------------------------------------------------------------
public void testBidiRemoveByEntrySet() {
- removeByEntrySet(makeFullBidiMap(), KEY, VALUE);
- removeByEntrySet(makeFullBidiMap().inverseBidiMap(), VALUE, KEY);
+ removeByEntrySet(makeFullBidiMap(), entries[0][0], entries[0][1]);
+ removeByEntrySet(makeFullBidiMap().inverseBidiMap(), entries[0][1],
entries[0][0]);
}
private final void removeByEntrySet(BidiMap map, Object key, Object value) {
@@ -347,6 +346,12 @@
}
protected BidiMap makeFullBidiMap() {
return main.makeFullBidiMap().inverseBidiMap();
+ }
+ protected Object[] getSampleKeys() {
+ return main.getSampleValues();
+ }
+ protected Object[] getSampleValues() {
+ return main.getSampleKeys();
}
protected String getCompatibilityVersion() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
