Author: mbenson
Date: Mon Mar 7 18:47:09 2011
New Revision: 1078889
URL: http://svn.apache.org/viewvc?rev=1078889&view=rev
Log:
Decompose pair into an abstract class with element accessor methods +
mutable/immutable concrete expression classes
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
(with props)
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
(with props)
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
(with props)
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
(with props)
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java?rev=1078889&view=auto
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
Mon Mar 7 18:47:09 2011
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.commons.lang3;
+
+import java.util.Map;
+
+/**
+ * Immutable concrete manifestation of the {@link Pair} type.
+ *
+ * <p>#ThreadSafe# if the objects are threadsafe</p>
+ * @since Lang 3.0
+ * @author Matt Benson
+ * @version $Id$
+ *
+ * @param <L> left generic type
+ * @param <R> right generic type
+ */
+public class ImmutablePair<L, R> extends Pair<L, R> {
+ /** Serialization version */
+ private static final long serialVersionUID = 4954918890077093841L;
+
+ /** Left object */
+ public final L left;
+ /** Right object */
+ public final R right;
+
+ /**
+ * Create a new ImmutablePair instance.
+ *
+ * @param left
+ * @param right
+ */
+ public ImmutablePair(L left, R right) {
+ super();
+ this.left = left;
+ this.right = right;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public L getLeftElement() {
+ return left;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public R getRightElement() {
+ return right;
+ }
+
+ /**
+ * {@link Map.Entry#setValue(Object)} implementation.
+ * @throws UnsupportedOperationException
+ */
+ public R setValue(R arg0) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Static fluent creation method for an {@link ImmutablePair}<L, R>:
+ * <code>ImmutablePair.of(left, right)</code>
+ * @param <L>
+ * @param <R>
+ * @param left
+ * @param right
+ * @return ImmutablePair<L, R>(left, right)
+ */
+ public static <L, R> ImmutablePair<L, R> of(L left, R right) {
+ return new ImmutablePair<L, R>(left, right);
+ }
+}
Propchange:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ImmutablePair.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java?rev=1078889&view=auto
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
Mon Mar 7 18:47:09 2011
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.commons.lang3;
+
+import java.util.Map;
+
+/**
+ * Mutable concrete manifestation of the {@link Pair} type.
+ *
+ * <p>#ThreadSafe# if the objects are threadsafe</p>
+ * @since Lang 3.0
+ * @author Matt Benson
+ * @version $Id$
+ *
+ * @param <L> left generic type
+ * @param <R> right generic type
+ */
+public class MutablePair<L, R> extends Pair<L, R> {
+ /** Serialization version */
+ private static final long serialVersionUID = 4954918890077093841L;
+
+ private L leftElement;
+ private R rightElement;
+
+ /**
+ * Create a new MutablePair instance.
+ */
+ public MutablePair() {
+ super();
+ }
+
+ /**
+ * Create a new MutablePair instance.
+ *
+ * @param leftElement
+ * @param rightElement
+ */
+ public MutablePair(L leftElement, R rightElement) {
+ super();
+ this.leftElement = leftElement;
+ this.rightElement = rightElement;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public L getLeftElement() {
+ return leftElement;
+ }
+
+ /**
+ * Set the left element of the pair.
+ * @param leftElement
+ */
+ public void setLeftElement(L leftElement) {
+ this.leftElement = leftElement;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public R getRightElement() {
+ return rightElement;
+ }
+
+ /**
+ * Set the right element of the pair.
+ * @param rightElement
+ */
+ public void setRightElement(R rightElement) {
+ this.rightElement = rightElement;
+ }
+
+ /**
+ * Implement {@link Map.Entry#setValue(Object)}.
+ * @param value value (<code>rightElement</code>) to set
+ */
+ public R setValue(R value) {
+ R result = getRightElement();
+ setRightElement(value);
+ return result;
+ }
+
+ /**
+ * Static fluent creation method for a {@link MutablePair}<L, R>:
+ * <code>MutablePair.of(left, right)</code>
+ * @param <L>
+ * @param <R>
+ * @param left
+ * @param right
+ * @return MutablePair<L, R>(left, right)
+ */
+ public static <L, R> MutablePair<L, R> of(L left, R right) {
+ return new MutablePair<L, R>(left, right);
+ }
+}
Propchange:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/MutablePair.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java?rev=1078889&r1=1078888&r2=1078889&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
(original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Pair.java
Mon Mar 7 18:47:09 2011
@@ -17,35 +17,47 @@
package org.apache.commons.lang3;
import java.io.Serializable;
+import java.util.Map;
import org.apache.commons.lang3.builder.HashCodeBuilder;
/**
- * A basic immutable Object pair.
- *
- * <p>#ThreadSafe# if the objects are threadsafe</p>
+ * Abstract Pair (or 2-element Tuple).
+ *
* @since Lang 3.0
* @author Matt Benson
* @version $Id$
*/
-public final class Pair<L, R> implements Serializable {
+public abstract class Pair<L, R> implements Serializable, Map.Entry<L, R> {
/** Serialization version */
private static final long serialVersionUID = 4954918890077093841L;
- /** Left object */
- public final L left;
+ /**
+ * Get the "left" element of the pair.
+ * @return L
+ */
+ public abstract L getLeftElement();
- /** Right object */
- public final R right;
+ /**
+ * Get the "right" element of the pair.
+ * @return
+ */
+ public abstract R getRightElement();
/**
- * Create a new Pair instance.
- * @param left
- * @param right
+ * Return {@link #getLeftElement()} as a {@link Map.Entry}'s key.
+ * @return L
+ */
+ public final L getKey() {
+ return getLeftElement();
+ }
+
+ /**
+ * Return {@link #getRightElement()} as a {@link Map.Entry}'s value.
+ * @return R
*/
- public Pair(L left, R right) {
- this.left = left;
- this.right = right;
+ public R getValue() {
+ return getRightElement();
}
/**
@@ -60,7 +72,8 @@ public final class Pair<L, R> implements
return false;
}
Pair<?, ?> other = (Pair<?, ?>) obj;
- return ObjectUtils.equals(left, other.left) &&
ObjectUtils.equals(right, other.right);
+ return ObjectUtils.equals(getLeftElement(), other.getLeftElement())
+ && ObjectUtils.equals(getRightElement(),
other.getRightElement());
}
/**
@@ -68,7 +81,9 @@ public final class Pair<L, R> implements
*/
@Override
public int hashCode() {
- return new HashCodeBuilder().append(left).append(right).toHashCode();
+ // TODO should the hashCodeBuilder be seeded per concrete type?
+ return new
HashCodeBuilder().append(getLeftElement()).append(getRightElement())
+ .toHashCode();
}
/**
@@ -76,24 +91,25 @@ public final class Pair<L, R> implements
*/
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ StringBuilder builder = new
StringBuilder(ClassUtils.getShortClassName(this, null));
builder.append("(");
- builder.append(left);
+ builder.append(getLeftElement());
builder.append(",");
- builder.append(right);
+ builder.append(getRightElement());
builder.append(")");
return builder.toString();
}
/**
- * Static fluent creation method for a Pair<L, R>: <code>Pair.of(left,
right)</code>
+ * Static fluent creation method for a {@link Pair}<L, R>:
+ * <code>Pair.of(left, right)</code>
* @param <L>
* @param <R>
* @param left
* @param right
- * @return Pair<L, R>(left, right)
+ * @return ImmutablePair<L, R>(left, right)
*/
public static <L, R> Pair<L, R> of(L left, R right) {
- return new Pair<L, R>(left, right);
+ return new ImmutablePair<L, R>(left, right);
}
}
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java?rev=1078889&r1=1078888&r2=1078889&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
Mon Mar 7 18:47:09 2011
@@ -159,7 +159,7 @@ public class EqualsBuilder implements Bu
static boolean isRegistered(Object lhs, Object rhs) {
Set<Pair<IDKey, IDKey>> registry = getRegistry();
Pair<IDKey, IDKey> pair = getRegisterPair(lhs, rhs);
- Pair<IDKey, IDKey> swappedPair = Pair.of(pair.right, pair.left);
+ Pair<IDKey, IDKey> swappedPair = Pair.of(pair.getLeftElement(),
pair.getRightElement());
return registry != null
&& (registry.contains(pair) || registry.contains(swappedPair));
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java?rev=1078889&view=auto
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
(added)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
Mon Mar 7 18:47:09 2011
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.commons.lang3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.junit.Test;
+
+/**
+ * Test the Pair class.
+ * @author Matt Benson
+ * @version $Id$
+ */
+public class ImmutablePairTest {
+
+ @Test
+ public void testBasic() throws Exception {
+ ImmutablePair<Integer, String> pair = new ImmutablePair<Integer,
String>(0, "foo");
+ assertEquals(0, pair.left.intValue());
+ assertEquals(0, pair.getLeftElement().intValue());
+ assertEquals("foo", pair.right);
+ assertEquals("foo", pair.getRightElement());
+ ImmutablePair<Object, String> pair2 = new ImmutablePair<Object,
String>(null, "bar");
+ assertNull(pair2.left);
+ assertNull(pair2.getLeftElement());
+ assertEquals("bar", pair2.right);
+ assertEquals("bar", pair2.getRightElement());
+ }
+
+ @Test
+ public void testPairOf() throws Exception {
+ ImmutablePair<Integer, String> pair = ImmutablePair.of(0, "foo");
+ assertEquals(0, pair.left.intValue());
+ assertEquals(0, pair.getLeftElement().intValue());
+ assertEquals("foo", pair.right);
+ assertEquals("foo", pair.getRightElement());
+ ImmutablePair<Object, String> pair2 = ImmutablePair.of(null, "bar");
+ assertNull(pair2.left);
+ assertNull(pair2.getLeftElement());
+ assertEquals("bar", pair2.right);
+ assertEquals("bar", pair2.getRightElement());
+ }
+
+ @Test
+ public void testEquals() throws Exception {
+ assertEquals(ImmutablePair.of(null, "foo"), ImmutablePair.of(null,
"foo"));
+ assertFalse(ImmutablePair.of("foo", 0).equals(ImmutablePair.of("foo",
null)));
+ assertFalse(ImmutablePair.of("foo",
"bar").equals(ImmutablePair.of("xyz", "bar")));
+
+ ImmutablePair<String, String> p = ImmutablePair.of("foo", "bar");
+ assertTrue(p.equals(p));
+ assertFalse(p.equals(new Object()));
+ }
+
+ @Test
+ public void testHashCode() throws Exception {
+ assertEquals(ImmutablePair.of(null, "foo").hashCode(),
ImmutablePair.of(null, "foo").hashCode());
+ }
+
+ @Test
+ public void testToString() throws Exception {
+ assertEquals("ImmutablePair(null,null)", ImmutablePair.of(null,
null).toString());
+ assertEquals("ImmutablePair(null,two)", ImmutablePair.of(null,
"two").toString());
+ assertEquals("ImmutablePair(one,null)", ImmutablePair.of("one",
null).toString());
+ assertEquals("ImmutablePair(one,two)", ImmutablePair.of("one",
"two").toString());
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void testSerialization() throws Exception {
+ ImmutablePair<Integer, String> origPair = ImmutablePair.of(0, "foo");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(baos);
+ out.writeObject(origPair);
+ ImmutablePair<Integer, String> deserializedPair =
(ImmutablePair<Integer, String>) new ObjectInputStream(
+ new ByteArrayInputStream(baos.toByteArray())).readObject();
+ assertEquals(origPair, deserializedPair);
+ assertEquals(origPair.hashCode(), deserializedPair.hashCode());
+ }
+}
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java?rev=1078889&view=auto
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
(added)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
Mon Mar 7 18:47:09 2011
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.commons.lang3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.junit.Test;
+
+/**
+ * Test the MutablePair class.
+ * @author Matt Benson
+ * @version $Id$
+ */
+public class MutablePairTest {
+
+ @Test
+ public void testBasic() throws Exception {
+ MutablePair<Integer, String> pair = new MutablePair<Integer,
String>(0, "foo");
+ assertEquals(0, pair.getLeftElement().intValue());
+ assertEquals("foo", pair.getRightElement());
+ MutablePair<Object, String> pair2 = new MutablePair<Object,
String>(null, "bar");
+ assertNull(pair2.getLeftElement());
+ assertEquals("bar", pair2.getRightElement());
+ }
+
+ @Test
+ public void testDefault() throws Exception {
+ MutablePair<Integer, String> pair = new MutablePair<Integer, String>();
+ assertNull(pair.getLeftElement());
+ assertNull(pair.getRightElement());
+ }
+
+ @Test
+ public void testMutate() throws Exception {
+ MutablePair<Integer, String> pair = new MutablePair<Integer,
String>(0, "foo");
+ pair.setLeftElement(42);
+ pair.setRightElement("bar");
+ assertEquals(42, pair.getLeftElement().intValue());
+ assertEquals("bar", pair.getRightElement());
+ }
+
+ @Test
+ public void testPairOf() throws Exception {
+ MutablePair<Integer, String> pair = MutablePair.of(0, "foo");
+ assertEquals(0, pair.getLeftElement().intValue());
+ assertEquals("foo", pair.getRightElement());
+ MutablePair<Object, String> pair2 = MutablePair.of(null, "bar");
+ assertNull(pair2.getLeftElement());
+ assertEquals("bar", pair2.getRightElement());
+ }
+
+ @Test
+ public void testEquals() throws Exception {
+ assertEquals(MutablePair.of(null, "foo"), MutablePair.of(null, "foo"));
+ assertFalse(MutablePair.of("foo", 0).equals(MutablePair.of("foo",
null)));
+ assertFalse(MutablePair.of("foo", "bar").equals(MutablePair.of("xyz",
"bar")));
+
+ MutablePair<String, String> p = MutablePair.of("foo", "bar");
+ assertTrue(p.equals(p));
+ assertFalse(p.equals(new Object()));
+ }
+
+ @Test
+ public void testHashCode() throws Exception {
+ assertEquals(MutablePair.of(null, "foo").hashCode(),
MutablePair.of(null, "foo").hashCode());
+ }
+
+ @Test
+ public void testToString() throws Exception {
+ assertEquals("MutablePair(null,null)", MutablePair.of(null,
null).toString());
+ assertEquals("MutablePair(null,two)", MutablePair.of(null,
"two").toString());
+ assertEquals("MutablePair(one,null)", MutablePair.of("one",
null).toString());
+ assertEquals("MutablePair(one,two)", MutablePair.of("one",
"two").toString());
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void testSerialization() throws Exception {
+ MutablePair<Integer, String> origPair = MutablePair.of(0, "foo");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(baos);
+ out.writeObject(origPair);
+ MutablePair<Integer, String> deserializedPair = (MutablePair<Integer,
String>) new ObjectInputStream(
+ new ByteArrayInputStream(baos.toByteArray())).readObject();
+ assertEquals(origPair, deserializedPair);
+ assertEquals(origPair.hashCode(), deserializedPair.hashCode());
+ }
+}
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/MutablePairTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java?rev=1078889&r1=1078888&r2=1078889&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/PairTest.java
Mon Mar 7 18:47:09 2011
@@ -18,13 +18,10 @@ package org.apache.commons.lang3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.util.HashSet;
import org.junit.Test;
@@ -36,59 +33,29 @@ import org.junit.Test;
public class PairTest {
@Test
- public void testBasic() throws Exception {
- Pair<Integer, String> pair = new Pair<Integer, String>(0, "foo");
- assertEquals(0, pair.left.intValue());
- assertEquals("foo", pair.right);
- Pair<Object, String> pair2 = new Pair<Object, String>(null, "bar");
- assertNull(pair2.left);
- assertEquals("bar", pair2.right);
- }
-
- @Test
public void testPairOf() throws Exception {
Pair<Integer, String> pair = Pair.of(0, "foo");
- assertEquals(0, pair.left.intValue());
- assertEquals("foo", pair.right);
+ assertTrue(pair instanceof ImmutablePair<?, ?>);
+ assertEquals(0, ((ImmutablePair<Integer, String>)
pair).left.intValue());
+ assertEquals("foo", ((ImmutablePair<Integer, String>) pair).right);
Pair<Object, String> pair2 = Pair.of(null, "bar");
- assertNull(pair2.left);
- assertEquals("bar", pair2.right);
- }
-
- @Test
- public void testEquals() throws Exception {
- assertEquals(Pair.of(null, "foo"), Pair.of(null, "foo"));
- assertFalse(Pair.of("foo", 0).equals(Pair.of("foo", null)));
- assertFalse(Pair.of("foo", "bar").equals(Pair.of("xyz", "bar")));
-
- Pair p = Pair.of("foo", "bar");
- assertTrue(p.equals(p));
- assertFalse(p.equals(new Object()));
- }
-
- @Test
- public void testHashCode() throws Exception {
- assertEquals(Pair.of(null, "foo").hashCode(), Pair.of(null,
"foo").hashCode());
- }
-
- @Test
- public void testToString() throws Exception {
- assertEquals("(null,null)", Pair.of(null, null).toString());
- assertEquals("(null,two)", Pair.of(null, "two").toString());
- assertEquals("(one,null)", Pair.of("one", null).toString());
- assertEquals("(one,two)", Pair.of("one", "two").toString());
+ assertTrue(pair2 instanceof ImmutablePair<?, ?>);
+ assertNull(((ImmutablePair<Object, String>) pair2).left);
+ assertEquals("bar", ((ImmutablePair<Object, String>) pair2).right);
}
@Test
- @SuppressWarnings("unchecked")
- public void testSerialization() throws Exception {
- Pair<Integer, String> origPair = Pair.of(0, "foo");
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(baos);
- out.writeObject(origPair);
- Pair<Integer, String> deserializedPair = (Pair<Integer, String>) new
ObjectInputStream(
- new ByteArrayInputStream(baos.toByteArray())).readObject();
- assertEquals(origPair, deserializedPair);
- assertEquals(origPair.hashCode(), deserializedPair.hashCode());
+ public void testCompatibility() throws Exception {
+ Pair<Integer, String> pair = ImmutablePair.of(0, "foo");
+ Pair<Integer, String> pair2 = MutablePair.of(0, "foo");
+ assertEquals(pair, pair2);
+ assertEquals(pair.hashCode(), pair2.hashCode());
+ HashSet<Pair<Integer, String>> set = new HashSet<Pair<Integer,
String>>();
+ set.add(pair);
+ assertTrue(set.contains(pair2));
+
+ pair2.setValue("bar");
+ assertFalse(pair.equals(pair2));
+ assertFalse(pair.hashCode() == pair2.hashCode());
}
}
