[jboss-cvs] JBossAS SVN: r81158 - in projects/jboss-man/trunk/metatype/src: test/java/org/jboss/test/metatype/values/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 17 02:24:17 EST 2008
Author: scott.stark at jboss.org
Date: 2008-11-17 02:24:17 -0500 (Mon, 17 Nov 2008)
New Revision: 81158
Modified:
projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java
projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java
projects/jboss-man/trunk/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
Log:
JBMAN-34, SimpleValue Comparator, Comparable tests
Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java 2008-11-17 06:25:35 UTC (rev 81157)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueComparator.java 2008-11-17 07:24:17 UTC (rev 81158)
@@ -21,8 +21,10 @@
*/
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;
@@ -41,74 +43,80 @@
int compare = -1;
if(o1.getMetaType() == SimpleMetaType.BIGINTEGER && o2.getMetaType() == SimpleMetaType.BIGINTEGER)
{
- BigInteger v1 = BigInteger.class.cast(o1);
- BigInteger v2 = BigInteger.class.cast(o2);
+ 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);
- Boolean v2 = Boolean.class.cast(o2);
+ 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);
- Byte v2 = Byte.class.cast(o2);
+ 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);
- Character v2 = Character.class.cast(o2);
+ 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)
{
- Character v1 = Character.class.cast(o1);
- Character v2 = Character.class.cast(o2);
+ 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);
- Double v2 = Double.class.cast(o2);
+ 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);
- Float v2 = Float.class.cast(o2);
+ 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);
- Integer v2 = Integer.class.cast(o2);
+ 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);
- Long v2 = Long.class.cast(o2);
+ 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);
- Short v2 = Short.class.cast(o2);
+ 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);
- String v2 = String.class.cast(o2);
+ 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);
- Name v2 = Name.class.cast(o2);
+ 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)
Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-11-17 06:25:35 UTC (rev 81157)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/SimpleValueSupport.java 2008-11-17 07:24:17 UTC (rev 81158)
@@ -22,7 +22,9 @@
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;
@@ -140,73 +142,79 @@
if(getMetaType() == SimpleMetaType.BIGINTEGER && sv.getMetaType() == SimpleMetaType.BIGINTEGER)
{
BigInteger v1 = BigInteger.class.cast(value);
- BigInteger v2 = BigInteger.class.cast(sv);
+ 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);
+ 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);
+ 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);
+ Character v2 = Character.class.cast(sv.getValue());
compare = v1.compareTo(v2);
}
else if(getMetaType() == SimpleMetaType.DATE && sv.getMetaType() == SimpleMetaType.DATE)
{
- Character v1 = Character.class.cast(value);
- Character v2 = Character.class.cast(sv);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ Name v2 = Name.class.cast(sv.getValue());
compare = v1.compareTo(v2);
}
else if(getMetaType() == SimpleMetaType.VOID && sv.getMetaType() == SimpleMetaType.VOID)
Modified: projects/jboss-man/trunk/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-11-17 06:25:35 UTC (rev 81157)
+++ projects/jboss-man/trunk/metatype/src/test/java/org/jboss/test/metatype/values/test/SimpleValueSupportUnitTestCase.java 2008-11-17 07:24:17 UTC (rev 81158)
@@ -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