Skip to content

Commit 726a0cf

Browse files
StevenArztStevenArzt
committed
fixed a test case and updated Maven projects
1 parent 31ce22f commit 726a0cf

File tree

8 files changed

+23
-15
lines changed

8 files changed

+23
-15
lines changed

‎soot-infoflow-android/.classpath‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<attribute name="maven.pomderived" value="true"/>
66
</attributes>
77
</classpathentry>
8-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
8+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
99
<attributes>
1010
<attribute name="maven.pomderived" value="true"/>
1111
</attributes>
1212
</classpathentry>
13-
<classpathentry including="**/*.java" kind="src" output="build/classes" path="src">
13+
<classpathentry kind="src" output="build/classes" path="src">
1414
<attributes>
1515
<attribute name="optional" value="true"/>
1616
<attribute name="maven.pomderived" value="true"/>
@@ -23,5 +23,10 @@
2323
<attribute name="maven.pomderived" value="true"/>
2424
</attributes>
2525
</classpathentry>
26+
<classpathentry excluding="**" kind="src" output="build/classes" path="schema">
27+
<attributes>
28+
<attribute name="maven.pomderived" value="true"/>
29+
</attributes>
30+
</classpathentry>
2631
<classpathentry kind="output" path="build/classes"/>
2732
</classpath>

‎soot-infoflow-android/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4-
org.eclipse.jdt.core.compiler.compliance=1.8
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=16
4+
org.eclipse.jdt.core.compiler.compliance=16
55
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
66
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
77
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
@@ -22,4 +22,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
2222
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
2323
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
2424
org.eclipse.jdt.core.compiler.release=disabled
25-
org.eclipse.jdt.core.compiler.source=1.8
25+
org.eclipse.jdt.core.compiler.source=16

‎soot-infoflow-cmd/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry including="**/*.java" kind="src" output="build/classes" path="src">
3+
<classpathentry kind="src" output="build/classes" path="src">
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
1212
</attributes>

‎soot-infoflow-cmd/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=16
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.compliance=16
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,4 +27,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
2727
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
2828
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
2929
org.eclipse.jdt.core.compiler.release=disabled
30-
org.eclipse.jdt.core.compiler.source=1.8
30+
org.eclipse.jdt.core.compiler.source=16

‎soot-infoflow-summaries/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<attribute name="maven.pomderived" value="true"/>
1414
</attributes>
1515
</classpathentry>
16-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
1717
<attributes>
1818
<attribute name="maven.pomderived" value="true"/>
1919
</attributes>

‎soot-infoflow-summaries/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=16
44
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5-
org.eclipse.jdt.core.compiler.compliance=1.8
5+
org.eclipse.jdt.core.compiler.compliance=16
66
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
77
org.eclipse.jdt.core.compiler.debug.localVariable=generate
88
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,4 +26,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
2626
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
2727
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
2828
org.eclipse.jdt.core.compiler.release=disabled
29-
org.eclipse.jdt.core.compiler.source=1.8
29+
org.eclipse.jdt.core.compiler.source=16

‎soot-infoflow-summaries/summariesManual/SummaryMetaData.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<!-- java.util -->
3434
<class name="java.util.Comparator" isInterface="true" />
3535

36+
<class name="java.util.ArrayList$ListItr" superClass="java.util.ArrayList$Itr" />
37+
<class name="java.util.ArrayList$Itr" superClass="java.lang.Object" />
38+
3639
<!-- java.util.function -->
3740
<class name="java.util.function.BiConsumer" isInterface="true" />
3841
<class name="java.util.function.BiFunction" isInterface="true" />

‎soot-infoflow-summaries/test/soot/jimple/infoflow/test/methodSummary/junit/HierarchyTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class HierarchyTests {
2020

2121
@Test
2222
public void superClassesTest() {
23-
List<String> superclasses = testProvider.getSuperclassesOf("java.util.ArrayList$ListItr");
23+
List<String> superclasses = manualProvider.getSuperclassesOf("java.util.ArrayList$ListItr");
2424
assertEquals(2, superclasses.size());
2525
assertEquals("java.util.ArrayList$Itr", superclasses.get(0));
2626
assertEquals("java.lang.Object", superclasses.get(1));

0 commit comments

Comments
 (0)