Index: enhanced/classlib/trunk/modules/jndi/src/test/java/tests/api/javax/naming/TestBinding.java =================================================================== --- enhanced/classlib/trunk/modules/jndi/src/test/java/tests/api/javax/naming/TestBinding.java (revision 388610) +++ enhanced/classlib/trunk/modules/jndi/src/test/java/tests/api/javax/naming/TestBinding.java (working copy) @@ -58,8 +58,9 @@ public void testConstructor_NullValue() { Binding p; - p = new Binding(null, null, null); - assertTrue(null == p.getName()); + + p = new Binding("name1", null, null); + assertEquals("name1", p.getName()); assertTrue(null == p.getClassName()); assertTrue(null == p.getObject()); } @@ -67,14 +68,15 @@ public void testConstructor_DefaultRelativeValue() { Binding p; - p = new Binding(null, null); + p = new Binding("name1", null); assertEquals(true, p.isRelative()); } public void testToString() { log.setMethod("testToString"); Binding p; - p = new Binding(null, null, false); + + p = new Binding("name1", null, false); assertTrue(p.toString().startsWith("(not relative")); p = new Binding("name1", new Integer(3)); String str = p.toString(); @@ -102,15 +104,14 @@ } public void testGetSetName() { - Binding p = new Binding("name", new Integer(1)); + Binding p; + p = new Binding("name", new Integer(1)); assertEquals("name", p.getName()); p.setName("name1"); assertEquals("name1", p.getName()); p.setName(""); assertEquals("", p.getName()); - p.setName(null); - assertEquals(null, p.getName()); } public void testGetSetClassName() { @@ -124,10 +125,10 @@ public void testGetSetRelative() { Binding p; + p = new Binding("name", new Integer(1)); assertTrue(p.isRelative()); p.setRelative(false); assertFalse(p.isRelative()); } - -} \ No newline at end of file +} Index: enhanced/classlib/trunk/modules/jndi/src/test/java/tests/api/javax/naming/TestNameClassPair.java =================================================================== --- enhanced/classlib/trunk/modules/jndi/src/test/java/tests/api/javax/naming/TestNameClassPair.java (revision 388610) +++ enhanced/classlib/trunk/modules/jndi/src/test/java/tests/api/javax/naming/TestNameClassPair.java (working copy) @@ -59,29 +59,29 @@ public void testConstructor_NullValue() { NameClassPair p; - p = new NameClassPair(null, null); - assertTrue(null == p.getName()); + p = new NameClassPair("name1", null); + assertEquals("name1", p.getName()); assertTrue(null == p.getClassName()); } public void testConstructor_DefaultRelativeValue() { NameClassPair p; - p = new NameClassPair(null, null); + p = new NameClassPair("name1", null); assertEquals(true, p.isRelative()); } public void testToString() { NameClassPair p; - p = new NameClassPair(null, null, false); + p = new NameClassPair("name1", null, false); assertTrue(p.toString().startsWith("(not relative")); } public void testGetSetName() { NameClassPair p; - p = new NameClassPair(null, null, true); + p = new NameClassPair("name1", null, true); p.setName("aname"); assertEquals("aname", p.getName()); } @@ -89,7 +89,7 @@ public void testGetSetClassName() { NameClassPair p; - p = new NameClassPair(null, null, true); + p = new NameClassPair("name1", null, true); p.setClassName("aclassname"); assertEquals("aclassname", p.getClassName()); } @@ -97,9 +97,8 @@ public void testGetSetRelative() { NameClassPair p; - p = new NameClassPair(null, null, true); + p = new NameClassPair("name1", null, true); p.setRelative(false); assertEquals(false, p.isRelative()); } - -} \ No newline at end of file +}