diff --git a/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt b/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt index ad9232d08..f2bc72dea 100644 --- a/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt +++ b/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt @@ -1,3 +1,5 @@ +apple\/.* +com\/apple\/.* java\/awt\/.* javax\/swing\/.* sun\/awt\/.* @@ -10,4 +12,7 @@ com\/ibm\/crypto\/.* com\/ibm\/security\/.* org\/apache\/xerces\/.* dalvik\/.* -java\/io\/ObjectStreamClass* \ No newline at end of file +java\/io\/ObjectStreamClass* +jdk\/.* +org\/omg\/.* +org\/w3c\/.* diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java index e4edc7210..a803a43d9 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java @@ -36,7 +36,7 @@ public class LibraryVersionTest extends WalaTestCase { @Test public void testLibraryVersion() throws IOException { AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER); System.err.println("java library version is " + scope.getJavaLibraryVersion()); - Assert.assertTrue(scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries()); + Assert.assertTrue(scope.isJava18Libraries() || scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries()); } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java index 7e73e803b..294ebd1e8 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java @@ -411,6 +411,10 @@ public class AnalysisScope { } } + public boolean isJava18Libraries() throws IllegalStateException { + return getJavaLibraryVersion().startsWith("1.8"); + } + public boolean isJava17Libraries() throws IllegalStateException { return getJavaLibraryVersion().startsWith("1.7"); }