Skip to content

Commit 4456785

Browse files
committed
check if the file imports "android.test.ActivityInstrumentationTestCase2"
1 parent e121ffb commit 4456785

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

src/main/java/ResultsWriter.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private void outputTestMethodResults() throws IOException {
4444
for (FileEntity fileEntity: files) {
4545
try {
4646
for (MethodEntity methodEntity: fileEntity.getMethods()) {
47-
dataLine = new String[9];
47+
dataLine = new String[10];
4848
dataLine[0] = fileEntity.getAppName();
4949
dataLine[1] = fileEntity.getFilePath();
5050
dataLine[2] = fileEntity.getRelativeFilePath();
@@ -54,6 +54,7 @@ private void outputTestMethodResults() throws IOException {
5454
dataLine[6] = methodEntity.isHasAnnotation()?"True":"False";
5555
dataLine[7] = methodEntity.isHasTestInName()?"True":"False";
5656
dataLine[8] = fileEntity.isHasTestInFileName()?"True":"False";
57+
dataLine[9] = fileEntity.getHas_androidtestActivityInstrumentationTestCase2()?"True":"False";
5758

5859
fileLines.add(dataLine);
5960
}
@@ -71,13 +72,13 @@ private void outputTestFileResults() throws IOException {
7172
CSVWriter writer = new CSVWriter(new FileWriter(testFileCSV.toString()), ',');
7273
List<String[]> fileLines = new ArrayList<String[]>();
7374
String[] columnNames = {"App","FilePath", "RelativeFilePath", "FileName", "TotalMethods","TotalTestMethods","AnnotationCount", "TestsWithoutAnnotationCount", "HasTestInFileName",
74-
"junit.framework.Test", "junit.framework.TestCase", "org.junit.Test", "android.test.AndroidTestCase", "android.test.InstrumentationTestCase", "org.junit.Assert"};
75+
"junitFrameworkTest", "junitFrameworkTestCase", "orgJunitTest", "androidTestAndroidTestCase", "androidTestInstrumentationTestCase", "orgJunitAssert", "androidTestActivityInstrumentationTestCase2"};
7576
fileLines.add(columnNames);
7677

7778
String[] dataLine;
7879
for (FileEntity fileEntity: files) {
7980
try {
80-
dataLine = new String[15];
81+
dataLine = new String[16];
8182
dataLine[0] = fileEntity.getAppName();
8283
dataLine[1] = fileEntity.getFilePath();
8384
dataLine[2] = fileEntity.getRelativeFilePath();
@@ -93,6 +94,7 @@ private void outputTestFileResults() throws IOException {
9394
dataLine[12] = fileEntity.getHas_androidtestAndroidTestCase()?"True":"False";
9495
dataLine[13] = fileEntity.getHas_androidtestInstrumentationTestCase()?"True":"False";
9596
dataLine[14] = fileEntity.getHas_orgjunitAssert()?"True":"False";
97+
dataLine[15] = fileEntity.getHas_androidtestActivityInstrumentationTestCase2()?"True":"False";
9698

9799
fileLines.add(dataLine);
98100
} catch (Exception e) {

src/main/java/TestFileDetector.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public TestFileDetector(String absoluteFilePath) throws FileNotFoundException {
2626
imports.put("android.test.AndroidTestCase",false);
2727
imports.put("android.test.InstrumentationTestCase",false);
2828
imports.put("org.junit.Assert",false);
29+
imports.put("android.test.ActivityInstrumentationTestCase2",false);
2930

3031
parseFile(absoluteFilePath);
3132
}
@@ -94,6 +95,9 @@ public void visit(ImportDeclaration n, Void arg) {
9495
imports.replace("org.junit.Assert",false,true);
9596
}
9697

98+
if (n.getNameAsString().contains("android.test.ActivityInstrumentationTestCase2")){
99+
imports.replace("android.test.ActivityInstrumentationTestCase2",false,true);
100+
}
97101

98102
super.visit(n, arg);
99103
}

src/main/java/entity/FileEntity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ public boolean getHas_androidtestInstrumentationTestCase()
8080
return imports.get("android.test.InstrumentationTestCase");
8181
}
8282

83+
public boolean getHas_androidtestActivityInstrumentationTestCase2()
84+
{
85+
return imports.get("android.test.ActivityInstrumentationTestCase2");
86+
}
87+
8388
public boolean getHas_orgjunitAssert(){
8489
return imports.get("org.junit.Assert");
8590
}

0 commit comments

Comments
 (0)