From d81d8569ebb7c63915e7d03111f15fddd647e43a Mon Sep 17 00:00:00 2001 From: msridhar1 Date: Tue, 3 Apr 2012 22:43:34 +0000 Subject: [PATCH] fix test git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4554 f5eafffb-2e1d-0410-98e4-8ec43c5233c4 --- .../src/com/ibm/wala/core/tests/cha/DupFieldsTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java index e1a3e1f7f..84b3f6833 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java @@ -24,6 +24,7 @@ import com.ibm.wala.ipa.callgraph.AnalysisScope; import com.ibm.wala.ipa.cha.ClassHierarchy; import com.ibm.wala.ipa.cha.ClassHierarchyException; import com.ibm.wala.types.ClassLoaderReference; +import com.ibm.wala.types.FieldReference; import com.ibm.wala.types.TypeReference; import com.ibm.wala.util.config.AnalysisScopeReader; import com.ibm.wala.util.io.FileProvider; @@ -35,17 +36,18 @@ public class DupFieldsTest extends WalaTestCase { AnalysisScope scope = null; scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, FileProvider.getFile("J2SEClassHierarchyExclusions.txt"), DupFieldsTest.class.getClassLoader()); ClassHierarchy cha = ClassHierarchy.make(scope); - IClass klass = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application, "LDupFieldName")); + TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Application, "LDupFieldName"); + IClass klass = cha.lookupClass(ref); boolean threwException = false; try { klass.getField(Atom.findOrCreateUnicodeAtom("a")); } catch (IllegalStateException e) { threwException = true; } - Assert.assertTrue(threwException); - IField f = klass.getField(Atom.findOrCreateUnicodeAtom("a"), TypeReference.IntName); + Assert.assertTrue(threwException); + IField f = cha.resolveField(FieldReference.findOrCreate(ref, Atom.findOrCreateUnicodeAtom("a"), TypeReference.Int)); Assert.assertEquals(f.getFieldTypeReference(), TypeReference.Int); - f = klass.getField(Atom.findOrCreateUnicodeAtom("a"), TypeReference.BooleanName); + f = cha.resolveField(FieldReference.findOrCreate(ref, Atom.findOrCreateUnicodeAtom("a"), TypeReference.Boolean)); Assert.assertEquals(f.getFieldTypeReference(), TypeReference.Boolean); } }