Skip to content

Commit 020fdcf

Browse files
shehanshehan
committed
Merge remote-tracking branch 'origin/master'
2 parents 9918580 + 610082e commit 020fdcf

3 files changed

Lines changed: 45 additions & 27 deletions

File tree

‎src/main/java/ResultsWriter.java‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,25 @@ public void outputToCSV(boolean includeMethodDetails) throws IOException {
3737
private void outputTestMethodResults() throws IOException {
3838
CSVWriter writer = new CSVWriter(new FileWriter(testMethodCSV.toString()), ',');
3939
List<String[]> fileLines = new ArrayList<String[]>();
40-
String[] columnNames = {"App", "FilePath", "RelativeFilePath", "FileName", "MethodName","TotalLines","MethodHasAnnotation", "MethodHasTestInName", "FileHasTestInName"};
40+
String[] columnNames = {"App","Tag", "FilePath", "RelativeFilePath", "FileName", "MethodName","TotalLines","MethodHasAnnotation", "MethodHasTestInName", "FileHasTestInName"};
4141
fileLines.add(columnNames);
4242

4343
String[] dataLine;
4444
for (FileEntity fileEntity: files) {
4545
try {
4646
for (MethodEntity methodEntity: fileEntity.getMethods()) {
47-
dataLine = new String[9];
47+
dataLine = new String[11];
4848
dataLine[0] = fileEntity.getAppName();
49-
dataLine[1] = fileEntity.getFilePath();
50-
dataLine[2] = fileEntity.getRelativeFilePath();
51-
dataLine[3] = fileEntity.getFileName();
52-
dataLine[4] = methodEntity.getMethodName();
53-
dataLine[5] = String.valueOf(methodEntity.getTotalLines());
54-
dataLine[6] = methodEntity.isHasAnnotation()?"True":"False";
55-
dataLine[7] = methodEntity.isHasTestInName()?"True":"False";
56-
dataLine[8] = fileEntity.isHasTestInFileName()?"True":"False";
49+
dataLine[1] = fileEntity.getTagName();
50+
dataLine[2] = fileEntity.getFilePath();
51+
dataLine[3] = fileEntity.getRelativeFilePath();
52+
dataLine[4] = fileEntity.getFileName();
53+
dataLine[5] = methodEntity.getMethodName();
54+
dataLine[6] = String.valueOf(methodEntity.getTotalLines());
55+
dataLine[7] = methodEntity.isHasAnnotation()?"True":"False";
56+
dataLine[8] = methodEntity.isHasTestInName()?"True":"False";
57+
dataLine[9] = fileEntity.isHasTestInFileName()?"True":"False";
58+
dataLine[10] = fileEntity.getHas_androidtestActivityInstrumentationTestCase2()?"True":"False";
5759

5860
fileLines.add(dataLine);
5961
}
@@ -70,29 +72,31 @@ private void outputTestMethodResults() throws IOException {
7072
private void outputTestFileResults() throws IOException {
7173
CSVWriter writer = new CSVWriter(new FileWriter(testFileCSV.toString()), ',');
7274
List<String[]> fileLines = new ArrayList<String[]>();
73-
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+
String[] columnNames = {"App","Tag","FilePath", "RelativeFilePath", "FileName", "TotalMethods","TotalTestMethods","AnnotationCount", "TestsWithoutAnnotationCount", "HasTestInFileName",
76+
"junitFrameworkTest", "junitFrameworkTestCase", "orgJunitTest", "androidTestAndroidTestCase", "androidTestInstrumentationTestCase", "orgJunitAssert", "androidTestActivityInstrumentationTestCase2"};
7577
fileLines.add(columnNames);
7678

7779
String[] dataLine;
7880
for (FileEntity fileEntity: files) {
7981
try {
80-
dataLine = new String[15];
82+
dataLine = new String[17];
8183
dataLine[0] = fileEntity.getAppName();
82-
dataLine[1] = fileEntity.getFilePath();
83-
dataLine[2] = fileEntity.getRelativeFilePath();
84-
dataLine[3] = fileEntity.getFileName();
85-
dataLine[4] = String.valueOf(fileEntity.getMethods().size());
86-
dataLine[5] = String.valueOf(fileEntity.getTotalTestMethods());
87-
dataLine[6] = String.valueOf(fileEntity.getTestAnnotationCount());
88-
dataLine[7] = String.valueOf(fileEntity.getTestMethodWithoutAnnotationCount());
89-
dataLine[8] = fileEntity.isHasTestInFileName()?"True":"False";
90-
dataLine[9] = fileEntity.getHas_junitframeworkTest()?"True":"False";
91-
dataLine[10] = fileEntity.getHas_junitframeworkTestCase()?"True":"False";
92-
dataLine[11] = fileEntity.getHas_orgjunitTest()?"True":"False";
93-
dataLine[12] = fileEntity.getHas_androidtestAndroidTestCase()?"True":"False";
94-
dataLine[13] = fileEntity.getHas_androidtestInstrumentationTestCase()?"True":"False";
95-
dataLine[14] = fileEntity.getHas_orgjunitAssert()?"True":"False";
84+
dataLine[1] = fileEntity.getTagName();
85+
dataLine[2] = fileEntity.getFilePath();
86+
dataLine[3] = fileEntity.getRelativeFilePath();
87+
dataLine[4] = fileEntity.getFileName();
88+
dataLine[5] = String.valueOf(fileEntity.getMethods().size());
89+
dataLine[6] = String.valueOf(fileEntity.getTotalTestMethods());
90+
dataLine[7] = String.valueOf(fileEntity.getTestAnnotationCount());
91+
dataLine[8] = String.valueOf(fileEntity.getTestMethodWithoutAnnotationCount());
92+
dataLine[9] = fileEntity.isHasTestInFileName()?"True":"False";
93+
dataLine[10] = fileEntity.getHas_junitframeworkTest()?"True":"False";
94+
dataLine[11] = fileEntity.getHas_junitframeworkTestCase()?"True":"False";
95+
dataLine[12] = fileEntity.getHas_orgjunitTest()?"True":"False";
96+
dataLine[13] = fileEntity.getHas_androidtestAndroidTestCase()?"True":"False";
97+
dataLine[14] = fileEntity.getHas_androidtestInstrumentationTestCase()?"True":"False";
98+
dataLine[15] = fileEntity.getHas_orgjunitAssert()?"True":"False";
99+
dataLine[16] = fileEntity.getHas_androidtestActivityInstrumentationTestCase2()?"True":"False";
96100

97101
fileLines.add(dataLine);
98102
} 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: 10 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
}
@@ -98,4 +103,9 @@ public String getAppName(){
98103
String filePath = path.toAbsolutePath().toString();
99104
return filePath.split("\\\\")[3];
100105
}
106+
107+
public String getTagName(){
108+
String filePath = path.toAbsolutePath().toString();
109+
return filePath.split("\\\\")[4];
110+
}
101111
}

0 commit comments

Comments
 (0)