Author: hughesj
Date: Fri Nov 23 03:32:26 2007
New Revision: 597646
URL: http://svn.apache.org/viewvc?rev=597646&view=rev
Log:
Tightened up NCName so you can't create one with a null value.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java
incubator/woden/trunk/java/test/org/apache/woden/types/NCNameTest.java
Modified: incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java?rev=597646&r1=597645&r2=597646&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/types/NCName.java Fri Nov
23 03:32:26 2007
@@ -42,12 +42,7 @@
}
private String fValue = null;
-
- public NCName()
- {
- super();
- }
-
+
/**
*
* @param value String representing an NCName
@@ -55,6 +50,9 @@
*/
public NCName(String value)
{
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
setValue(value);
}
Modified: incubator/woden/trunk/java/test/org/apache/woden/types/NCNameTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/types/NCNameTest.java?rev=597646&r1=597645&r2=597646&view=diff
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/types/NCNameTest.java
(original)
+++ incubator/woden/trunk/java/test/org/apache/woden/types/NCNameTest.java Fri
Nov 23 03:32:26 2007
@@ -37,9 +37,9 @@
n1_dup = new NCName("someNCName");
n1_dup2 = new NCName("someNCName");
n2 = new NCName("someOtheNCName");
- n3= new NCName();
- n3_dup = new NCName();
- n3_dup2 = new NCName();
+ n3= new NCName("");
+ n3_dup = new NCName("");
+ n3_dup2 = new NCName("");
}
public void testEqualsWithNullValueNCNames() {
@@ -79,4 +79,13 @@
assertTrue("Null param doesn't return false", n1.equals(null) ==
false);
}
+ public void testThrowsIllegalArgExceptionWithNullArgument() {
+ try {
+ NCName nc = new NCName(null);
+ fail("NCName(null) should throw IllegalArgumentException");
+ } catch (IllegalArgumentException iae) {
+ // do nothing as this is the expected result
+ }
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
