aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java
diff options
context:
space:
mode:
authorGravatar Irina Iancu <elenairina@google.com>2018-08-01 09:29:01 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-08-01 09:30:29 -0700
commitf8afad6f22786ba646cbd10a73e5738884cc84b8 (patch)
tree5c651454fa4c9fd49949bcbdaad3f6f39fb04216 /tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java
parentf330439fb970cfa17c70fc59c1458bb1c31c9522 (diff)
Add a parser for gcov intermediate file format.
This change comes as a preparation for using gcov for Bazel C++ coverage instead of lcov. See documentation of gcov intermediate format at https://gcc.gnu.org/onlinedocs/gcc/Invoking-Gcov.html#Invoking-Gcov under --intermediate-format. Change-Id: I6cd2df8b3a6611b187a2b0c161b14388413bc670 PiperOrigin-RevId: 206940660
Diffstat (limited to 'tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java')
-rw-r--r--tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java
index a6b99fb12e..e8a6c754bf 100644
--- a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java
+++ b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/MainTest.java
@@ -15,6 +15,7 @@
package com.google.devtools.lcovmerger;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.lcovmerger.Constants.TRACEFILE_EXTENSION;
import java.io.File;
import java.io.IOException;
@@ -41,7 +42,7 @@ public class MainTest {
@Test
public void testMainEmptyCoverageDir() {
- assertThat(Main.getLcovTracefilesFromDir(coverageDir.toAbsolutePath().toString())).isEmpty();
+ assertThat(Main.getCoverageFilesInDir(coverageDir.toAbsolutePath().toString())).isEmpty();
}
@Test
@@ -52,7 +53,8 @@ public class MainTest {
Files.createTempFile(ccCoverageDir, "tracefile1", ".dat");
Files.createTempFile(javaCoverageDir, "tracefile2", ".dat");
- List<File> tracefiles = Main.getLcovTracefilesFromDir(coverageDir.toAbsolutePath().toString());
+ List<File> coverageFiles = Main.getCoverageFilesInDir(coverageDir.toAbsolutePath().toString());
+ List<File> tracefiles = Main.getFilesWithExtension(coverageFiles, TRACEFILE_EXTENSION);
assertThat(tracefiles).hasSize(2);
}
}