prints the app name and relative file path in the output files

Author: shehan

src/main/java/ResultsWriter.java

@@ -37,21 +37,23 @@ public void outputToCSV(boolean includeMethodDetails) throws IOException {
     private void outputTestMethodResults() throws IOException {
         CSVWriter writer = new CSVWriter(new FileWriter(testMethodCSV.toString()), ',');
         List<String[]> fileLines = new ArrayList<String[]>();
-        String[] columnNames  = {"FilePath", "FileName", "MethodName","TotalLines","MethodHasAnnotation", "MethodHasTestInName", "FileHasTestInName"};
+        String[] columnNames  = {"App", "FilePath", "RelativeFilePath", "FileName", "MethodName","TotalLines","MethodHasAnnotation", "MethodHasTestInName", "FileHasTestInName"};
         fileLines.add(columnNames);
 
         String[] dataLine;
         for (FileEntity fileEntity: files) {
             try {
                 for (MethodEntity methodEntity: fileEntity.getMethods()) {
-                    dataLine = new String[7];
-                    dataLine[0] = fileEntity.getFilePath();
-                    dataLine[1] = fileEntity.getFileName();
-                    dataLine[2] = methodEntity.getMethodName();
-                    dataLine[3] = String.valueOf(methodEntity.getTotalLines());
-                    dataLine[4] = methodEntity.isHasAnnotation()?"True":"False";
-                    dataLine[5] = methodEntity.isHasTestInName()?"True":"False";
-                    dataLine[6] = fileEntity.isHasTestInFileName()?"True":"False";
+                    dataLine = new String[9];
+                    dataLine[0] = fileEntity.getAppName();
+                    dataLine[1] = fileEntity.getFilePath();
+                    dataLine[2] = fileEntity.getRelativeFilePath();
+                    dataLine[3] = fileEntity.getFileName();
+                    dataLine[4] = methodEntity.getMethodName();
+                    dataLine[5] = String.valueOf(methodEntity.getTotalLines());
+                    dataLine[6] = methodEntity.isHasAnnotation()?"True":"False";
+                    dataLine[7] = methodEntity.isHasTestInName()?"True":"False";
+                    dataLine[8] = fileEntity.isHasTestInFileName()?"True":"False";
 
                     fileLines.add(dataLine);
                 }
@@ -68,27 +70,29 @@ private void outputTestMethodResults() throws IOException {
     private void outputTestFileResults() throws IOException {
         CSVWriter writer = new CSVWriter(new FileWriter(testFileCSV.toString()), ',');
         List<String[]> fileLines = new ArrayList<String[]>();
-        String[] columnNames  = {"FilePath", "FileName", "TotalMethods","TotalTestMethods","AnnotationCount", "TestsWithoutAnnotationCount", "HasTestInFileName",
+        String[] columnNames  = {"App","FilePath", "RelativeFilePath", "FileName", "TotalMethods","TotalTestMethods","AnnotationCount", "TestsWithoutAnnotationCount", "HasTestInFileName",
                 "junit.framework.Test", "junit.framework.TestCase", "org.junit.Test", "android.test.AndroidTestCase", "android.test.InstrumentationTestCase", "org.junit.Assert"};
         fileLines.add(columnNames);
 
         String[] dataLine;
         for (FileEntity fileEntity: files) {
             try {
-                dataLine = new String[13];
-                dataLine[0] = fileEntity.getFilePath();
-                dataLine[1] = fileEntity.getFileName();
-                dataLine[2] = String.valueOf(fileEntity.getMethods().size());
-                dataLine[3] = String.valueOf(fileEntity.getTotalTestMethods());
-                dataLine[4] = String.valueOf(fileEntity.getTestAnnotationCount());
-                dataLine[5] = String.valueOf(fileEntity.getTestMethodWithoutAnnotationCount());
-                dataLine[6] = fileEntity.isHasTestInFileName()?"True":"False";
-                dataLine[7] = fileEntity.getHas_junitframeworkTest()?"True":"False";
-                dataLine[8] = fileEntity.getHas_junitframeworkTestCase()?"True":"False";
-                dataLine[9] = fileEntity.getHas_orgjunitTest()?"True":"False";
-                dataLine[10] = fileEntity.getHas_androidtestAndroidTestCase()?"True":"False";
-                dataLine[11] = fileEntity.getHas_androidtestInstrumentationTestCase()?"True":"False";
-                dataLine[12] = fileEntity.getHas_orgjunitAssert()?"True":"False";
+                dataLine = new String[15];
+                dataLine[0] = fileEntity.getAppName();
+                dataLine[1] = fileEntity.getFilePath();
+                dataLine[2] = fileEntity.getRelativeFilePath();
+                dataLine[3] = fileEntity.getFileName();
+                dataLine[4] = String.valueOf(fileEntity.getMethods().size());
+                dataLine[5] = String.valueOf(fileEntity.getTotalTestMethods());
+                dataLine[6] = String.valueOf(fileEntity.getTestAnnotationCount());
+                dataLine[7] = String.valueOf(fileEntity.getTestMethodWithoutAnnotationCount());
+                dataLine[8] = fileEntity.isHasTestInFileName()?"True":"False";
+                dataLine[9] = fileEntity.getHas_junitframeworkTest()?"True":"False";
+                dataLine[10] = fileEntity.getHas_junitframeworkTestCase()?"True":"False";
+                dataLine[11] = fileEntity.getHas_orgjunitTest()?"True":"False";
+                dataLine[12] = fileEntity.getHas_androidtestAndroidTestCase()?"True":"False";
+                dataLine[13] = fileEntity.getHas_androidtestInstrumentationTestCase()?"True":"False";
+                dataLine[14] = fileEntity.getHas_orgjunitAssert()?"True":"False";
 
                 fileLines.add(dataLine);
             } catch (Exception e) {