Index: test/java/org/apache/harmony/pack200/tests/CPUTF8Test.java =================================================================== --- test/java/org/apache/harmony/pack200/tests/CPUTF8Test.java (revision 643602) +++ test/java/org/apache/harmony/pack200/tests/CPUTF8Test.java (working copy) @@ -23,20 +23,6 @@ public class CPUTF8Test extends TestCase { - public void testUnequalCompareStrings() { - CPUTF8 one = new CPUTF8("(III)V", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); - CPUTF8 two = new CPUTF8("((I[II)V", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); - CPUTF8 three = new CPUTF8("([III)V", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); - assertFalse(one.normalComparisonString().equals(two.normalComparisonString())); - assertFalse(one.signatureComparisonString().equals(two.signatureComparisonString())); - - assertFalse(one.normalComparisonString().equals(three.normalComparisonString())); - assertFalse(one.signatureComparisonString().equals(three.signatureComparisonString())); - - assertFalse(two.normalComparisonString().equals(three.normalComparisonString())); - assertFalse(two.signatureComparisonString().equals(three.signatureComparisonString())); - } - public void testEquality() { CPUTF8 one = new CPUTF8("(III)V", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); CPUTF8 two = new CPUTF8("((I[II)V", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); Index: test/java/org/apache/harmony/pack200/tests/bytecode/ConstantPoolTest.java =================================================================== --- test/java/org/apache/harmony/pack200/tests/bytecode/ConstantPoolTest.java (revision 643602) +++ test/java/org/apache/harmony/pack200/tests/bytecode/ConstantPoolTest.java (working copy) @@ -18,6 +18,7 @@ import junit.framework.TestCase; +import org.apache.harmony.pack200.Segment; import org.apache.harmony.pack200.bytecode.CPClass; import org.apache.harmony.pack200.bytecode.CPMember; import org.apache.harmony.pack200.bytecode.CPUTF8; @@ -48,7 +49,7 @@ pool.add(new CPUTF8("OtherThing", ClassConstantPool.DOMAIN_NORMALASCIIZ)); CPUTF8 u1 = new CPUTF8("thing", ClassConstantPool.DOMAIN_NORMALASCIIZ); pool.add(u1); - pool.resolve(); + pool.resolve(new Segment()); assertTrue(pool.indexOf(u1) > 0); }