diff options
author | Tobias Thierer <tobiast@google.com> | 2017-09-06 13:54:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-06 13:54:41 +0000 |
commit | 4d6b7740b94ecda72b5cb54864693913fc3c6d23 (patch) | |
tree | 78e131cb33b58d08431c74af516b91853332ba0c | |
parent | ba85888f2df1b3fd93b2d3434d272b130ab1cc41 (diff) | |
parent | 4806ee120a3ab149f73045dacab8fb620939a3aa (diff) | |
download | platform_cts-4d6b7740b94ecda72b5cb54864693913fc3c6d23.tar.gz platform_cts-4d6b7740b94ecda72b5cb54864693913fc3c6d23.tar.bz2 platform_cts-4d6b7740b94ecda72b5cb54864693913fc3c6d23.zip |
Merge "Improve CtsApiCoverage error message for missing testApk files"
-rw-r--r-- | tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java index fb82c95dfd6..06aa6faf688 100644 --- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java +++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/CtsApiCoverage.java @@ -43,6 +43,7 @@ import java.util.Arrays; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Set; import javax.xml.transform.TransformerException; @@ -103,6 +104,8 @@ public class CtsApiCoverage { String reportTitle = "CTS API Coverage"; int apiLevel = Integer.MAX_VALUE; + List<File> notFoundTestApks = new ArrayList<File>(); + int numTestApkArgs = 0; for (int i = 0; i < args.length; i++) { if (args[i].startsWith("-")) { if ("-o".equals(args[i])) { @@ -133,14 +136,23 @@ public class CtsApiCoverage { } } else { File file = new File(args[i]); + numTestApkArgs++; if (file.isDirectory()) { testApks.addAll(Arrays.asList(file.listFiles(SUPPORTED_FILE_NAME_FILTER))); - } else { + } else if (file.isFile()) { testApks.add(file); + } else { + notFoundTestApks.add(file); } } } + if (!notFoundTestApks.isEmpty()) { + String msg = String.format(Locale.US, "%d/%d testApks not found: %s", + notFoundTestApks.size(), numTestApkArgs, notFoundTestApks); + throw new IllegalArgumentException(msg); + } + /* * 1. Create an ApiCoverage object that is a tree of Java objects representing the API * in current.xml. The object will have no information about the coverage for each |