scolebourne 2003/07/30 16:21:39
Modified: lang/src/test/org/apache/commons/lang/enum
EnumUtilsTest.java
lang/src/java/org/apache/commons/lang/enum EnumUtils.java
Log:
Bring EnumUtils public constructor testing in line with main package
Revision Changes Path
1.5 +18 -1
jakarta-commons/lang/src/test/org/apache/commons/lang/enum/EnumUtilsTest.java
Index: EnumUtilsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/enum/EnumUtilsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EnumUtilsTest.java 30 Jul 2003 23:13:09 -0000 1.4
+++ EnumUtilsTest.java 30 Jul 2003 23:21:39 -0000 1.5
@@ -53,6 +53,8 @@
*/
package org.apache.commons.lang.enum;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -83,6 +85,17 @@
return suite;
}
+ //-----------------------------------------------------------------------
+ public void testConstructor() {
+ assertNotNull(new EnumUtils());
+ Constructor[] cons = EnumUtils.class.getDeclaredConstructors();
+ assertEquals(1, cons.length);
+ assertEquals(true, Modifier.isPublic(cons[0].getModifiers()));
+ assertEquals(true, Modifier.isPublic(EnumUtils.class.getModifiers()));
+ assertEquals(false, Modifier.isFinal(EnumUtils.class.getModifiers()));
+ }
+
+ //-----------------------------------------------------------------------
public void testIterator() {
Iterator it = EnumUtils.iterator(ColorEnum.class);
assertSame(ColorEnum.RED, it.next());
@@ -103,6 +116,7 @@
} catch (IllegalArgumentException ex) {}
}
+ //-----------------------------------------------------------------------
public void testList() {
List list = EnumUtils.getEnumList(ColorEnum.class);
Iterator it = list.iterator();
@@ -124,6 +138,7 @@
} catch (IllegalArgumentException ex) {}
}
+ //-----------------------------------------------------------------------
public void testMap() {
Map map = EnumUtils.getEnumMap(ColorEnum.class);
assertTrue(map.containsValue(ColorEnum.RED));
@@ -147,6 +162,7 @@
} catch (IllegalArgumentException ex) {}
}
+ //-----------------------------------------------------------------------
public void testGet() {
assertSame(ColorEnum.RED, EnumUtils.getEnum(ColorEnum.class, "Red"));
assertSame(ColorEnum.GREEN, EnumUtils.getEnum(ColorEnum.class, "Green"));
@@ -166,6 +182,7 @@
} catch (IllegalArgumentException ex) {}
}
+ //-----------------------------------------------------------------------
public void testGetValue() {
assertSame(ValuedColorEnum.RED, EnumUtils.getEnum(ValuedColorEnum.class,
1));
assertSame(ValuedColorEnum.GREEN, EnumUtils.getEnum(ValuedColorEnum.class,
2));
1.8 +3 -3
jakarta-commons/lang/src/java/org/apache/commons/lang/enum/EnumUtils.java
Index: EnumUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/enum/EnumUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EnumUtils.java 14 Jul 2003 22:25:04 -0000 1.7
+++ EnumUtils.java 30 Jul 2003 23:21:39 -0000 1.8
@@ -69,9 +69,9 @@
public class EnumUtils {
/**
- * Restricted constructor.
+ * Public constructor. This class should not normally be instantiated.
*/
- private EnumUtils() {
+ public EnumUtils() {
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
