Index: modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java =================================================================== --- modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java (revision 490073) +++ modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java (working copy) @@ -1026,11 +1026,25 @@ name = new CompoundName("", props); try { name.addAll(null); - fail("should throw NullPointerException"); - } catch (NullPointerException e) { + fail("IllegalArgumentException expected"); + } catch (IllegalArgumentException e) { + //expected } } + public void testAddAll_Flat() throws InvalidNameException { + log.setMethod("testAddAll_Flat()"); + CompoundName name; + + name = new CompoundName("aaa", new Properties()); + try { + name.addAll(new CompoundName("bbb", new Properties())); + fail("should throw InvalidNameException"); + } catch (InvalidNameException e) { + // Expected + } + } + public void testAddAll_Indexed() throws InvalidNameException { log.setMethod("testAddAll_Indexed()"); CompoundName name; @@ -1078,8 +1092,9 @@ name = new CompoundName("", props); try { name.addAll(0, null); - fail("should throw NullPointerException"); - } catch (NullPointerException e) { + fail("IllegalArgumentException expected"); + } catch (IllegalArgumentException e) { + //expected } }