diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/android')
9 files changed, 38 insertions, 74 deletions
diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java index e28d65ceb3..80bf3386b1 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java @@ -22,8 +22,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.jimfs.Jimfs; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.Subject; import com.google.devtools.build.android.AndroidDataBuilder.ResourceType; import com.google.devtools.build.android.AndroidDataMerger.MergeConflictException; import com.google.devtools.build.android.AndroidDataMerger.SourceChecker; @@ -1300,15 +1299,8 @@ public class AndroidDataMergerTest { assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected); } - final SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> - unwrittenMergedAndroidData = - new SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData>() { - @Override - public UnwrittenMergedAndroidDataSubject getSubject( - FailureStrategy fs, UnwrittenMergedAndroidData that) { - return new UnwrittenMergedAndroidDataSubject(fs, that); - } - }; + final Subject.Factory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> + unwrittenMergedAndroidData = UnwrittenMergedAndroidDataSubject::new; private static final class TestLoggingHandler extends Handler { public final List<String> warnings = new ArrayList<String>(); diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java index a8cbd2161e..8698750bac 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataWriterTest.java @@ -20,8 +20,7 @@ import com.android.ide.common.internal.PngCruncher; import com.android.ide.common.internal.PngException; import com.google.common.collect.ImmutableMap; import com.google.common.jimfs.Jimfs; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.Subject; import com.google.common.util.concurrent.MoreExecutors; import java.io.File; import java.io.IOException; @@ -391,11 +390,5 @@ public class AndroidDataWriterTest { assertAbout(paths).that(actual.getAssetDir().resolve(asset)).exists(); } - private static final SubjectFactory<PathsSubject, Path> paths = - new SubjectFactory<PathsSubject, Path>() { - @Override - public PathsSubject getSubject(FailureStrategy failureStrategy, Path path) { - return new PathsSubject(failureStrategy, path); - } - }; + private static final Subject.Factory<PathsSubject, Path> paths = PathsSubject::new; } diff --git a/src/test/java/com/google/devtools/build/android/AndroidResourceClassWriterTest.java b/src/test/java/com/google/devtools/build/android/AndroidResourceClassWriterTest.java index 72eac32a7f..4fdaaa70c1 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidResourceClassWriterTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidResourceClassWriterTest.java @@ -19,8 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.jimfs.Jimfs; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.Subject; import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.Files; @@ -686,11 +685,5 @@ public class AndroidResourceClassWriterTest { } } - private static final SubjectFactory<ClassPathsSubject, Path> paths = - new SubjectFactory<ClassPathsSubject, Path>() { - @Override - public ClassPathsSubject getSubject(FailureStrategy failureStrategy, Path path) { - return new ClassPathsSubject(failureStrategy, path); - } - }; + private static final Subject.Factory<ClassPathsSubject, Path> paths = ClassPathsSubject::new; } diff --git a/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java b/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java index 3bc266c126..e8692562ba 100644 --- a/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java +++ b/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java @@ -19,7 +19,7 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import java.io.IOException; import java.lang.reflect.Field; @@ -38,8 +38,8 @@ import javax.annotation.Nullable; */ public class ClassPathsSubject extends Subject<ClassPathsSubject, Path> { - ClassPathsSubject(FailureStrategy failureStrategy, @Nullable Path subject) { - super(failureStrategy, subject); + ClassPathsSubject(FailureMetadata failureMetadata, @Nullable Path subject) { + super(failureMetadata, subject); } void exists() { @@ -113,19 +113,27 @@ public class ClassPathsSubject extends Subject<ClassPathsSubject, Path> { fail("should not be null."); } exists(); - return new ClassNameSubject(failureStrategy, getSubject(), className); + return check().about(ClassNameSubject.classNames(getSubject())).that(className); } static final class ClassNameSubject extends Subject<ClassNameSubject, String> { private final Path basePath; - public ClassNameSubject( - FailureStrategy failureStrategy, Path basePath, String subject) { - super(failureStrategy, subject); + public ClassNameSubject(FailureMetadata failureMetadata, Path basePath, String subject) { + super(failureMetadata, subject); this.basePath = basePath; } + static Subject.Factory<ClassNameSubject, String> classNames(Path basePath) { + return new Subject.Factory<ClassNameSubject, String>() { + @Override + public ClassNameSubject createSubject(FailureMetadata metadata, String actual) { + return new ClassNameSubject(metadata, basePath, actual); + } + }; + } + public void classContentsIsEqualTo( ImmutableMap<String, Integer> intFields, ImmutableMap<String, List<Integer>> intArrayFields, diff --git a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java index ee04e88a09..315a9c9ae6 100644 --- a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java +++ b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java @@ -24,8 +24,7 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.jimfs.Jimfs; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.Subject; import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.xml.ArrayXmlResourceValue; import com.google.devtools.build.android.xml.ArrayXmlResourceValue.ArrayType; @@ -1359,13 +1358,7 @@ public class DataResourceXmlTest { return mergedDataWriter.resourceDirectory().resolve("values/values.xml"); } - private static final SubjectFactory<PathsSubject, Path> resourcePaths = - new SubjectFactory<PathsSubject, Path>() { - @Override - public PathsSubject getSubject(FailureStrategy failureStrategy, Path path) { - return new PathsSubject(failureStrategy, path); - } - }; + private static final Subject.Factory<PathsSubject, Path> resourcePaths = PathsSubject::new; private static class FakeConsumer implements ParsedAndroidData.KeyValueConsumer<DataKey, DataResource> { diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java index 876c3fe2c5..07c6fa42a6 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java @@ -16,7 +16,7 @@ package com.google.devtools.build.android; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import java.util.ArrayList; import java.util.List; @@ -25,8 +25,8 @@ import java.util.Map.Entry; /** Testing Subject for comparing ParsedAndroidData instances. */ class ParsedAndroidDataSubject extends Subject<ParsedAndroidDataSubject, ParsedAndroidData> { - public ParsedAndroidDataSubject(FailureStrategy failureStrategy, ParsedAndroidData actual) { - super(failureStrategy, actual); + public ParsedAndroidDataSubject(FailureMetadata failureMetadata, ParsedAndroidData actual) { + super(failureMetadata, actual); } public void isEqualTo(ParsedAndroidData expectation) { diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java index 78d9789af4..1ac69385c9 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java @@ -21,8 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.jimfs.Jimfs; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.Subject; import com.google.common.truth.Truth; import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.FullyQualifiedName.Factory; @@ -664,12 +663,6 @@ public class ParsedAndroidDataTest { } } - final SubjectFactory<ParsedAndroidDataSubject, ParsedAndroidData> parsedAndroidData = - new SubjectFactory<ParsedAndroidDataSubject, ParsedAndroidData>() { - @Override - public ParsedAndroidDataSubject getSubject(FailureStrategy fs, ParsedAndroidData that) { - return new ParsedAndroidDataSubject(fs, that); - } - }; - + final Subject.Factory<ParsedAndroidDataSubject, ParsedAndroidData> parsedAndroidData = + ParsedAndroidDataSubject::new; } 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 5c4ad16ad3..9b653b22fe 100644 --- a/src/test/java/com/google/devtools/build/android/PathsSubject.java +++ b/src/test/java/com/google/devtools/build/android/PathsSubject.java @@ -16,7 +16,7 @@ package com.google.devtools.build.android; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Joiner; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import java.io.IOException; import java.io.StringReader; @@ -45,8 +45,8 @@ import org.xml.sax.SAXException; /** A testing utility that allows assertions against Paths. */ public class PathsSubject extends Subject<PathsSubject, Path> { - PathsSubject(FailureStrategy failureStrategy, @Nullable Path subject) { - super(failureStrategy, subject); + PathsSubject(FailureMetadata failureMetadata, @Nullable Path subject) { + super(failureMetadata, subject); } void exists() { diff --git a/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java b/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java index 5d774a1155..ea871a3c96 100644 --- a/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java +++ b/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java @@ -16,27 +16,19 @@ package com.google.devtools.build.android; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Objects; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; -import com.google.common.truth.SubjectFactory; import javax.annotation.Nullable; class UnwrittenMergedAndroidDataSubject extends Subject<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> { - static final SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> - FACTORY = - new SubjectFactory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData>() { - @Override - public UnwrittenMergedAndroidDataSubject getSubject( - FailureStrategy fs, UnwrittenMergedAndroidData that) { - return new UnwrittenMergedAndroidDataSubject(fs, that); - } - }; + static final Subject.Factory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> + FACTORY = UnwrittenMergedAndroidDataSubject::new; public UnwrittenMergedAndroidDataSubject( - FailureStrategy failureStrategy, @Nullable UnwrittenMergedAndroidData subject) { - super(failureStrategy, subject); + FailureMetadata failureMetadata, @Nullable UnwrittenMergedAndroidData subject) { + super(failureMetadata, subject); } public void isEqualTo(UnwrittenMergedAndroidData expected) { |