aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java
diff options
context:
space:
mode:
authorGravatar corysmith <corysmith@google.com>2017-09-22 02:02:35 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-09-22 12:16:02 +0200
commit54c86b4c6f29f4b0d52e1db702d30c10f3ac8b56 (patch)
tree08141e8298a2eadae818e7d8cce1198280e3c1be /src/test/java
parent87c70eef9cae2c2bb652ecc0baa16adb90a21eab (diff)
Action for resource shrinking with aapt2
Introduces the ResourcesZip class to more easily handle processing merged resources. RELNOTES: None PiperOrigin-RevId: 169622715
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/android/PathsSubject.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java b/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java
index 9dc1683295..319fa488f1 100644
--- a/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java
@@ -28,6 +28,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Test;
@@ -56,6 +57,7 @@ public class AaptCommandBuilderTest {
tester.testConstructor(AaptCommandBuilder.class.getConstructor(Path.class));
tester.ignore(AaptCommandBuilder.class.getMethod("execute", String.class));
+ tester.setDefault(Optional.class, Optional.empty());
tester.testAllPublicInstanceMethods(new AaptCommandBuilder(aapt));
tester.testAllPublicInstanceMethods(new AaptCommandBuilder(aapt).when(true));
tester.testAllPublicInstanceMethods(new AaptCommandBuilder(aapt).when(false));
diff --git a/src/test/java/com/google/devtools/build/android/PathsSubject.java b/src/test/java/com/google/devtools/build/android/PathsSubject.java
index 82ec2fdadb..f32ce8f8ab 100644
--- a/src/test/java/com/google/devtools/build/android/PathsSubject.java
+++ b/src/test/java/com/google/devtools/build/android/PathsSubject.java
@@ -47,7 +47,7 @@ public class PathsSubject extends Subject<PathsSubject, Path> {
}
void exists() {
- if (getSubject() == null) {
+ if (actual() == null) {
fail("should not be null.");
}
if (!Files.exists(getSubject())) {
@@ -56,7 +56,7 @@ public class PathsSubject extends Subject<PathsSubject, Path> {
}
void xmlContentsIsEqualTo(String... contents) {
- if (getSubject() == null) {
+ if (actual() == null) {
fail("should not be null.");
}
exists();