Skip to content

Commit bb85f3d

Browse files
StevenArztStevenArzt
committed
removed references to XmlPull exceptions
1 parent b9cd54a commit bb85f3d

31 files changed

+498
-555
lines changed

‎soot-infoflow-android/.classpath

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</classpathentry>
88
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
99
<attributes>
10+
<attribute name="module" value="true"/>
1011
<attribute name="maven.pomderived" value="true"/>
1112
</attributes>
1213
</classpathentry>
@@ -16,6 +17,11 @@
1617
<attribute name="maven.pomderived" value="true"/>
1718
</attributes>
1819
</classpathentry>
20+
<classpathentry kind="src" output="build/testclasses" path="test">
21+
<attributes>
22+
<attribute name="test" value="true"/>
23+
</attributes>
24+
</classpathentry>
1925
<classpathentry excluding="**" kind="src" output="build/classes" path="schema">
2026
<attributes>
2127
<attribute name="maven.pomderived" value="true"/>

‎soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/AliasingTest.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414

1515
import org.junit.Assert;
1616
import org.junit.Test;
17-
import org.xmlpull.v1.XmlPullParserException;
1817

1918
import soot.jimple.infoflow.results.InfoflowResults;
2019

2120
public abstract class AliasingTest extends JUnitTests {
22-
23-
@Test(timeout=300000)
24-
public void runTestFlowSensitivity1() throws IOException, XmlPullParserException {
21+
22+
@Test(timeout = 300000)
23+
public void runTestFlowSensitivity1() throws IOException {
2524
int expected = 0;
2625
// See also HeapTests#innerFieldReductionTestNegative
2726
if (mode == TestResultMode.FLOWDROID_BACKWARDS)
@@ -31,10 +30,10 @@ public void runTestFlowSensitivity1() throws IOException, XmlPullParserException
3130
if (res != null)
3231
Assert.assertEquals(expected, res.size());
3332
}
34-
35-
@Test(timeout=300000)
36-
// not yet supported
37-
public void runTestMerge1() throws IOException, XmlPullParserException {
33+
34+
@Test(timeout = 300000)
35+
// not yet supported
36+
public void runTestMerge1() throws IOException {
3837
int expected = 0;
3938
if (mode == TestResultMode.FLOWDROID_BACKWARDS || mode == TestResultMode.FLOWDROID_FORWARDS)
4039
expected = 1;
@@ -43,16 +42,16 @@ public void runTestMerge1() throws IOException, XmlPullParserException {
4342
if (res != null)
4443
Assert.assertEquals(expected, res.size());
4544
}
46-
47-
@Test(timeout=300000)
48-
public void runTestSimpleAliasing1() throws IOException, XmlPullParserException {
45+
46+
@Test(timeout = 300000)
47+
public void runTestSimpleAliasing1() throws IOException {
4948
InfoflowResults res = analyzeAPKFile("Aliasing/SimpleAliasing1.apk");
5049
Assert.assertNotNull(res);
5150
Assert.assertEquals(1, res.size());
5251
}
5352

54-
@Test(timeout=300000)
55-
public void runTestStrongUpdate1() throws IOException, XmlPullParserException {
53+
@Test(timeout = 300000)
54+
public void runTestStrongUpdate1() throws IOException {
5655
InfoflowResults res = analyzeAPKFile("Aliasing/StrongUpdate1.apk");
5756
if (res != null)
5857
Assert.assertEquals(0, res.size());

‎soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/AndroidSpecificTest.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,78 +14,77 @@
1414

1515
import org.junit.Assert;
1616
import org.junit.Test;
17-
import org.xmlpull.v1.XmlPullParserException;
1817

1918
import soot.jimple.infoflow.results.InfoflowResults;
2019

2120
public abstract class AndroidSpecificTest extends JUnitTests {
2221

2322
@Test // (timeout=300000)
24-
public void runTestApplicationModeling1() throws IOException, XmlPullParserException {
23+
public void runTestApplicationModeling1() throws IOException {
2524
InfoflowResults res = analyzeAPKFile("AndroidSpecific/ApplicationModeling1.apk");
2625
Assert.assertNotNull(res);
2726
Assert.assertEquals(1, res.size());
2827
}
2928

3029
@Test(timeout = 300000)
31-
public void runTestDirectLeak1() throws IOException, XmlPullParserException {
30+
public void runTestDirectLeak1() throws IOException {
3231
InfoflowResults res = analyzeAPKFile("AndroidSpecific/DirectLeak1.apk");
3332
Assert.assertNotNull(res);
3433
Assert.assertEquals(1, res.size());
3534
}
3635

3736
@Test(timeout = 300000)
38-
public void runTestInactiveActivity() throws IOException, XmlPullParserException {
37+
public void runTestInactiveActivity() throws IOException {
3938
InfoflowResults res = analyzeAPKFile("AndroidSpecific/InactiveActivity.apk");
4039
if (res != null)
4140
Assert.assertEquals(0, res.size());
4241
}
4342

4443
@Test(timeout = 300000)
45-
public void runTestLibrary2() throws IOException, XmlPullParserException {
44+
public void runTestLibrary2() throws IOException {
4645
InfoflowResults res = analyzeAPKFile("AndroidSpecific/Library2.apk");
4746
Assert.assertNotNull(res);
4847
Assert.assertEquals(1, res.size());
4948
}
5049

5150
@Test(timeout = 300000)
52-
public void runTestLogNoLeak() throws IOException, XmlPullParserException {
51+
public void runTestLogNoLeak() throws IOException {
5352
InfoflowResults res = analyzeAPKFile("AndroidSpecific/LogNoLeak.apk");
5453
if (res != null)
5554
Assert.assertEquals(0, res.size());
5655
}
5756

5857
@Test(timeout = 300000)
59-
public void runTestObfuscation1() throws IOException, XmlPullParserException {
58+
public void runTestObfuscation1() throws IOException {
6059
InfoflowResults res = analyzeAPKFile("AndroidSpecific/Obfuscation1.apk");
6160
Assert.assertNotNull(res);
6261
Assert.assertEquals(1, res.size());
6362
}
6463

6564
@Test(timeout = 300000)
66-
public void runTestParcel1() throws IOException, XmlPullParserException {
65+
public void runTestParcel1() throws IOException {
6766
InfoflowResults res = analyzeAPKFile("AndroidSpecific/Parcel1.apk");
6867
Assert.assertNotNull(res);
6968
Assert.assertEquals(1, res.size());
7069
}
7170

7271
@Test(timeout = 300000)
73-
public void runTestPrivateDataLeak1() throws IOException, XmlPullParserException {
72+
public void runTestPrivateDataLeak1() throws IOException {
7473
InfoflowResults res = analyzeAPKFile("AndroidSpecific/PrivateDataLeak1.apk");
7574
Assert.assertNotNull(res);
7675
Assert.assertEquals(1, res.size());
7776
}
7877

7978
@Test(timeout = 300000)
80-
public void runTestPrivateDataLeak2() throws IOException, XmlPullParserException {
79+
public void runTestPrivateDataLeak2() throws IOException {
8180
InfoflowResults res = analyzeAPKFile("AndroidSpecific/PrivateDataLeak2.apk");
8281
Assert.assertNotNull(res);
8382
Assert.assertEquals(1, res.size());
8483
}
8584

8685
@Test(timeout = 300000)
87-
// not supported, would require taint tracking via files
88-
public void runTestPrivateDataLeak3() throws IOException, XmlPullParserException {
86+
// not supported, would require taint tracking via files
87+
public void runTestPrivateDataLeak3() throws IOException {
8988
int expected = 2;
9089
if (mode == TestResultMode.FLOWDROID_BACKWARDS || mode == TestResultMode.FLOWDROID_FORWARDS)
9190
expected = 1;
@@ -96,21 +95,21 @@ public void runTestPrivateDataLeak3() throws IOException, XmlPullParserException
9695
}
9796

9897
@Test(timeout = 300000)
99-
public void runPublicAPIField1() throws IOException, XmlPullParserException {
98+
public void runPublicAPIField1() throws IOException {
10099
InfoflowResults res = analyzeAPKFile("AndroidSpecific/PublicAPIField1.apk");
101100
Assert.assertNotNull(res);
102101
Assert.assertEquals(1, res.size());
103102
}
104103

105104
@Test(timeout = 300000)
106-
public void runPublicAPIField2() throws IOException, XmlPullParserException {
105+
public void runPublicAPIField2() throws IOException {
107106
InfoflowResults res = analyzeAPKFile("AndroidSpecific/PublicAPIField2.apk");
108107
Assert.assertNotNull(res);
109108
Assert.assertEquals(1, res.size());
110109
}
111110

112111
@Test(timeout = 300000)
113-
public void runView1() throws IOException, XmlPullParserException {
112+
public void runView1() throws IOException {
114113
InfoflowResults res = analyzeAPKFile("AndroidSpecific/View1.apk");
115114
Assert.assertNotNull(res);
116115
Assert.assertEquals(1, res.size());

‎soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/ArrayAndListTest.java

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414

1515
import org.junit.Assert;
1616
import org.junit.Test;
17-
import org.xmlpull.v1.XmlPullParserException;
1817

1918
import soot.jimple.infoflow.results.InfoflowResults;
2019

2120
public abstract class ArrayAndListTest extends JUnitTests {
22-
23-
@Test(timeout=300000)
24-
public void runTestArrayAccess1() throws IOException, XmlPullParserException {
21+
22+
@Test(timeout = 300000)
23+
public void runTestArrayAccess1() throws IOException {
2524
int expected = 0;
2625
if (mode == TestResultMode.FLOWDROID_BACKWARDS || mode == TestResultMode.FLOWDROID_FORWARDS)
2726
expected = 1;
@@ -31,8 +30,8 @@ public void runTestArrayAccess1() throws IOException, XmlPullParserException {
3130
Assert.assertEquals(expected, res.size());
3231
}
3332

34-
@Test(timeout=300000)
35-
public void runTestArrayAccess2() throws IOException, XmlPullParserException {
33+
@Test(timeout = 300000)
34+
public void runTestArrayAccess2() throws IOException {
3635
int expected = 0;
3736
if (mode == TestResultMode.FLOWDROID_BACKWARDS || mode == TestResultMode.FLOWDROID_FORWARDS)
3837
expected = 1;
@@ -41,52 +40,52 @@ public void runTestArrayAccess2() throws IOException, XmlPullParserException {
4140
if (res != null)
4241
Assert.assertEquals(expected, res.size());
4342
}
44-
45-
@Test(timeout=300000)
46-
public void runTestArrayAccess3() throws IOException, XmlPullParserException {
43+
44+
@Test(timeout = 300000)
45+
public void runTestArrayAccess3() throws IOException {
4746
InfoflowResults res = analyzeAPKFile("ArraysAndLists/ArrayAccess3.apk");
4847
Assert.assertNotNull(res);
4948
Assert.assertEquals(1, res.size());
5049
}
51-
52-
@Test(timeout=300000)
53-
public void runTestArrayAccess4() throws IOException, XmlPullParserException {
50+
51+
@Test(timeout = 300000)
52+
public void runTestArrayAccess4() throws IOException {
5453
InfoflowResults res = analyzeAPKFile("ArraysAndLists/ArrayAccess4.apk");
5554
if (res != null)
5655
Assert.assertEquals(0, res.size());
5756
}
58-
59-
@Test(timeout=300000)
60-
public void runTestArrayAccess5() throws IOException, XmlPullParserException {
57+
58+
@Test(timeout = 300000)
59+
public void runTestArrayAccess5() throws IOException {
6160
InfoflowResults res = analyzeAPKFile("ArraysAndLists/ArrayAccess5.apk");
6261
if (res != null)
6362
Assert.assertEquals(0, res.size());
6463
}
6564

66-
@Test(timeout=300000)
67-
public void runTestArrayCopy1() throws IOException, XmlPullParserException {
65+
@Test(timeout = 300000)
66+
public void runTestArrayCopy1() throws IOException {
6867
InfoflowResults res = analyzeAPKFile("ArraysAndLists/ArrayCopy1.apk");
6968
Assert.assertEquals(1, res.size());
7069
}
71-
72-
@Test(timeout=300000)
73-
public void runTestArrayToString1() throws IOException, XmlPullParserException {
70+
71+
@Test(timeout = 300000)
72+
public void runTestArrayToString1() throws IOException {
7473
InfoflowResults res = analyzeAPKFile("ArraysAndLists/ArrayToString1.apk");
7574
Assert.assertEquals(1, res.size());
7675
}
77-
78-
@Test(timeout=300000)
79-
80-
public void runTestHashMapAccess1() throws IOException, XmlPullParserException {
76+
77+
@Test(timeout = 300000)
78+
79+
public void runTestHashMapAccess1() throws IOException {
8180
int expected = 0;
8281
if (mode == TestResultMode.FLOWDROID_BACKWARDS || mode == TestResultMode.FLOWDROID_FORWARDS)
8382
expected = 1;
8483
InfoflowResults res = analyzeAPKFile("ArraysAndLists/HashMapAccess1.apk");
8584
Assert.assertEquals(expected, res.size());
8685
}
8786

88-
@Test(timeout=300000)
89-
public void runTestListAccess1() throws IOException, XmlPullParserException {
87+
@Test(timeout = 300000)
88+
public void runTestListAccess1() throws IOException {
9089
int expected = 0;
9190
if (mode == TestResultMode.FLOWDROID_BACKWARDS || mode == TestResultMode.FLOWDROID_FORWARDS)
9291
expected = 1;
@@ -96,8 +95,8 @@ public void runTestListAccess1() throws IOException, XmlPullParserException {
9695
Assert.assertEquals(expected, res.size());
9796
}
9897

99-
@Test(timeout=300000)
100-
public void runTestMultidimensionalArray1() throws IOException, XmlPullParserException {
98+
@Test(timeout = 300000)
99+
public void runTestMultidimensionalArray1() throws IOException {
101100
InfoflowResults res = analyzeAPKFile("ArraysAndLists/MultidimensionalArray1.apk");
102101
Assert.assertEquals(1, res.size());
103102
}

0 commit comments

Comments
 (0)