[jboss-cvs] JBossAS SVN: r81465 - in projects/jboss-man/branches/Branch_2_0: metatype/src/main/java/org/jboss/metatype/api/types and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Nov 23 17:04:22 EST 2008
Author: scott.stark at jboss.org
Date: 2008-11-23 17:04:22 -0500 (Sun, 23 Nov 2008)
New Revision: 81465
Added:
projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java
Modified:
projects/jboss-man/branches/Branch_2_0/managed/src/test/java/org/jboss/test/managed/factory/support/amof/BigDecimalSimpleValue.java
projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/types/Name.java
projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValue.java
projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java
projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/plugins/types/StringName.java
projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/types/support/MockSimpleValue.java
projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
Log:
JBMAN-34, merge -c 81156, -c 81158 to bring the SimpleValue Compable changes into the 2.0 branch
Modified: projects/jboss-man/branches/Branch_2_0/managed/src/test/java/org/jboss/test/managed/factory/support/amof/BigDecimalSimpleValue.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/managed/src/test/java/org/jboss/test/managed/factory/support/amof/BigDecimalSimpleValue.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/managed/src/test/java/org/jboss/test/managed/factory/support/amof/BigDecimalSimpleValue.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -54,4 +54,14 @@
return value;
}
+ public int compareTo(SimpleValue o2)
+ {
+ int compare = -1;
+ if(o2 instanceof BigDecimalSimpleValue)
+ {
+ BigDecimalSimpleValue b2 = BigDecimalSimpleValue.class.cast(o2);
+ compare = value.compareTo(b2.value);
+ }
+ return compare;
+ }
}
Modified: projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/types/Name.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/types/Name.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/types/Name.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -22,6 +22,7 @@
package org.jboss.metatype.api.types;
import java.io.Serializable;
+import java.util.Comparator;
/**
* A name is a typed string representing a reference to
@@ -30,7 +31,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public interface Name extends Serializable
+public interface Name extends Serializable, Comparable<Name>
{
public String toString();
}
Modified: projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValue.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValue.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValue.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -29,9 +29,10 @@
* SimpleValue.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
-public interface SimpleValue extends MetaValue
+public interface SimpleValue extends MetaValue, Comparable<SimpleValue>
{
SimpleMetaType getMetaType();
Copied: projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java (from rev 81156, projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java)
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java (rev 0)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metatype.api.values;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.Date;
+
+import org.jboss.metatype.api.types.Name;
+import org.jboss.metatype.api.types.SimpleMetaType;
+
+/**
+ * A Comparator for SimpleValues.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class SimpleValueComparator
+ implements Comparator<SimpleValue>
+{
+ public int compare(SimpleValue o1, SimpleValue o2)
+ {
+ int compare = -1;
+ if(o1.getMetaType() == SimpleMetaType.BIGINTEGER && o2.getMetaType() == SimpleMetaType.BIGINTEGER)
+ {
+ BigInteger v1 = BigInteger.class.cast(o1.getValue());
+ BigInteger v2 = BigInteger.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.BIGDECIMAL && o2.getMetaType() == SimpleMetaType.BIGDECIMAL)
+ {
+ BigDecimal v1 = BigDecimal.class.cast(o1.getValue());
+ BigDecimal v2 = BigDecimal.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.BOOLEAN && o2.getMetaType() == SimpleMetaType.BOOLEAN)
+ {
+ Boolean v1 = Boolean.class.cast(o1.getValue());
+ Boolean v2 = Boolean.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.BYTE && o2.getMetaType() == SimpleMetaType.BYTE)
+ {
+ Byte v1 = Byte.class.cast(o1.getValue());
+ Byte v2 = Byte.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.CHARACTER && o2.getMetaType() == SimpleMetaType.CHARACTER)
+ {
+ Character v1 = Character.class.cast(o1.getValue());
+ Character v2 = Character.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.DATE && o2.getMetaType() == SimpleMetaType.DATE)
+ {
+ Date v1 = Date.class.cast(o1.getValue());
+ Date v2 = Date.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.DOUBLE && o2.getMetaType() == SimpleMetaType.DOUBLE)
+ {
+ Double v1 = Double.class.cast(o1.getValue());
+ Double v2 = Double.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.FLOAT && o2.getMetaType() == SimpleMetaType.FLOAT)
+ {
+ Float v1 = Float.class.cast(o1.getValue());
+ Float v2 = Float.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.INTEGER && o2.getMetaType() == SimpleMetaType.INTEGER)
+ {
+ Integer v1 = Integer.class.cast(o1.getValue());
+ Integer v2 = Integer.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.LONG && o2.getMetaType() == SimpleMetaType.LONG)
+ {
+ Long v1 = Long.class.cast(o1.getValue());
+ Long v2 = Long.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.SHORT && o2.getMetaType() == SimpleMetaType.SHORT)
+ {
+ Short v1 = Short.class.cast(o1.getValue());
+ Short v2 = Short.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.STRING && o2.getMetaType() == SimpleMetaType.STRING)
+ {
+ String v1 = String.class.cast(o1.getValue());
+ String v2 = String.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.NAMEDOBJECT && o2.getMetaType() == SimpleMetaType.NAMEDOBJECT)
+ {
+ Name v1 = Name.class.cast(o1.getValue());
+ Name v2 = Name.class.cast(o2.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(o1.getMetaType() == SimpleMetaType.VOID && o2.getMetaType() == SimpleMetaType.VOID)
+ {
+ compare = 0;
+ }
+
+ return compare;
+ }
+}
Modified: projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -22,7 +22,11 @@
package org.jboss.metatype.api.values;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+import org.jboss.metatype.api.types.Name;
import org.jboss.metatype.api.types.SimpleMetaType;
/**
@@ -131,4 +135,94 @@
{
return metaType + ":" + value;
}
+
+ public int compareTo(SimpleValue sv)
+ {
+ int compare = -1;
+ if(getMetaType() == SimpleMetaType.BIGINTEGER && sv.getMetaType() == SimpleMetaType.BIGINTEGER)
+ {
+ BigInteger v1 = BigInteger.class.cast(value);
+ BigInteger v2 = BigInteger.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.BIGDECIMAL && sv.getMetaType() == SimpleMetaType.BIGDECIMAL)
+ {
+ BigDecimal v1 = BigDecimal.class.cast(value);
+ BigDecimal v2 = BigDecimal.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.BOOLEAN && sv.getMetaType() == SimpleMetaType.BOOLEAN)
+ {
+ Boolean v1 = Boolean.class.cast(value);
+ Boolean v2 = Boolean.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.BYTE && sv.getMetaType() == SimpleMetaType.BYTE)
+ {
+ Byte v1 = Byte.class.cast(value);
+ Byte v2 = Byte.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.CHARACTER && sv.getMetaType() == SimpleMetaType.CHARACTER)
+ {
+ Character v1 = Character.class.cast(value);
+ Character v2 = Character.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.DATE && sv.getMetaType() == SimpleMetaType.DATE)
+ {
+ Date v1 = Date.class.cast(value);
+ Date v2 = Date.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.DOUBLE && sv.getMetaType() == SimpleMetaType.DOUBLE)
+ {
+ Double v1 = Double.class.cast(value);
+ Double v2 = Double.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.FLOAT && sv.getMetaType() == SimpleMetaType.FLOAT)
+ {
+ Float v1 = Float.class.cast(value);
+ Float v2 = Float.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.INTEGER && sv.getMetaType() == SimpleMetaType.INTEGER)
+ {
+ Integer v1 = Integer.class.cast(value);
+ Integer v2 = Integer.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.LONG && sv.getMetaType() == SimpleMetaType.LONG)
+ {
+ Long v1 = Long.class.cast(value);
+ Long v2 = Long.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.SHORT && sv.getMetaType() == SimpleMetaType.SHORT)
+ {
+ Short v1 = Short.class.cast(value);
+ Short v2 = Short.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.STRING && sv.getMetaType() == SimpleMetaType.STRING)
+ {
+ String v1 = String.class.cast(value);
+ String v2 = String.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.NAMEDOBJECT && sv.getMetaType() == SimpleMetaType.NAMEDOBJECT)
+ {
+ Name v1 = Name.class.cast(value);
+ Name v2 = Name.class.cast(sv.getValue());
+ compare = v1.compareTo(v2);
+ }
+ else if(getMetaType() == SimpleMetaType.VOID && sv.getMetaType() == SimpleMetaType.VOID)
+ {
+ compare = 0;
+ }
+
+ return compare;
+ }
+
}
Modified: projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/plugins/types/StringName.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/plugins/types/StringName.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/main/java/org/jboss/metatype/plugins/types/StringName.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -57,4 +57,12 @@
{
return name;
}
+
+ public int compareTo(Name n)
+ {
+ int compare = -1;
+ if(name != null)
+ compare = name.compareTo(n.toString());
+ return compare;
+ }
}
Modified: projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/types/support/MockSimpleValue.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/types/support/MockSimpleValue.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/types/support/MockSimpleValue.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -57,4 +57,12 @@
{
throw new org.jboss.util.NotImplementedException("getValue");
}
+
+ public int compareTo(SimpleValue sv)
+ {
+ int compare = -1;
+ if(equals(sv))
+ compare = 0;
+ return compare;
+ }
}
Modified: projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-11-23 21:48:39 UTC (rev 81464)
+++ projects/jboss-man/branches/Branch_2_0/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-11-23 22:04:22 UTC (rev 81465)
@@ -21,10 +21,15 @@
*/
package org.jboss.test.metatype.values.test;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
import junit.framework.Test;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.SimpleValue;
+import org.jboss.metatype.api.values.SimpleValueComparator;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.test.metatype.AbstractMetaTypeTest;
@@ -144,6 +149,171 @@
assertEquals("Wrong hash code generated", myHashCode, v.hashCode());
}
+ public void testStringComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+
+ SimpleValue s1 = SimpleValueSupport.wrap("value1");
+ SimpleValue s2 = SimpleValueSupport.wrap("value2");
+ assertTrue("value1 < value2", comparator.compare(s1, s2) < 0);
+ assertTrue("value2 < value1", comparator.compare(s2, s1) > 0);
+ assertTrue("value1 < value2", comparator.compare(s1, s1) == 0);
+
+ assertTrue("value1 < value2", s1.compareTo(s2) < 0);
+ assertTrue("value2 < value1", s2.compareTo(s1) > 0);
+ assertTrue("value1 < value2", s1.compareTo(s1) == 0);
+ }
+ public void testBigDecimalComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+
+ SimpleValue v1 = SimpleValueSupport.wrap(new BigDecimal(123456));
+ SimpleValue v2 = SimpleValueSupport.wrap(new BigDecimal(654321));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testBigIntegerComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+
+ SimpleValue v1 = SimpleValueSupport.wrap(new BigInteger("123456"));
+ SimpleValue v2 = SimpleValueSupport.wrap(new BigInteger("654321"));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testBooleanComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+
+ SimpleValue v1 = SimpleValueSupport.wrap(Boolean.FALSE);
+ SimpleValue v2 = SimpleValueSupport.wrap(Boolean.TRUE);
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testByteComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+
+ SimpleValue v1 = SimpleValueSupport.wrap(new Byte("1"));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Byte("2"));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testCharacterComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+
+ SimpleValue v1 = SimpleValueSupport.wrap(new Character('1'));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Character('2'));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testDateComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+ long d1 = System.currentTimeMillis();
+ long d2 = d1 + 100000;
+ SimpleValue v1 = SimpleValueSupport.wrap(new Date(d1));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Date(d2));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testDoubleComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+ SimpleValue v1 = SimpleValueSupport.wrap(new Double(12345));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Double(67890));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testFloatComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+ SimpleValue v1 = SimpleValueSupport.wrap(new Float(12345));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Float(67890));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testIntegerComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+ SimpleValue v1 = SimpleValueSupport.wrap(new Integer(12345));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Integer(67890));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testLongComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+ SimpleValue v1 = SimpleValueSupport.wrap(new Long(12345));
+ SimpleValue v2 = SimpleValueSupport.wrap(new Long(67890));
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+ public void testShortComparable()
+ {
+ SimpleValueComparator comparator = new SimpleValueComparator();
+ SimpleValue v1 = SimpleValueSupport.wrap(Short.MIN_VALUE);
+ SimpleValue v2 = SimpleValueSupport.wrap(Short.MAX_VALUE);
+ assertTrue("value1 < value2", comparator.compare(v1, v2) < 0);
+ assertTrue("value2 < value1", comparator.compare(v2, v1) > 0);
+ assertTrue("value1 < value2", comparator.compare(v1, v1) == 0);
+
+ assertTrue("value1 < value2", v1.compareTo(v2) < 0);
+ assertTrue("value2 < value1", v2.compareTo(v1) > 0);
+ assertTrue("value1 < value2", v1.compareTo(v1) == 0);
+ }
+
/**
* Test the toString for a simple value
*
More information about the jboss-cvs-commits
mailing list