diff options
| author | emcmanus <emcmanus@google.com> | 2017-04-16 11:01:09 -0700 |
|---|---|---|
| committer | Ron Shapiro <shapiro.rd@gmail.com> | 2017-04-20 14:56:41 -0400 |
| commit | 3b091f2f0ae474ec3df124d3cff39a9be1f5d3fb (patch) | |
| tree | 7900a9914621f1d4185e6a50b1b0f82e7e86de6a /common/src/test/java/com | |
| parent | 12599fdbdad5231c5e16d7db50320a087f3ad2d6 (diff) | |
| download | auto-3b091f2f0ae474ec3df124d3cff39a9be1f5d3fb.tar.gz | |
Fix a typo in MoreTypes that meant that, when comparing types, the containing type was not being compared correctly.
Closes https://github.com/google/auto/pull/476
Thanks to Dusan Bartos <doodeec@gmail.com> for pointing out the bug. His one-character change might reasonably have been expected to fix the problem, but alas things are rarely so simple.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=153296509
Diffstat (limited to 'common/src/test/java/com')
| -rw-r--r-- | common/src/test/java/com/google/auto/common/MoreTypesTest.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/common/src/test/java/com/google/auto/common/MoreTypesTest.java b/common/src/test/java/com/google/auto/common/MoreTypesTest.java index 59a62212..dfa6196a 100644 --- a/common/src/test/java/com/google/auto/common/MoreTypesTest.java +++ b/common/src/test/java/com/google/auto/common/MoreTypesTest.java @@ -66,6 +66,8 @@ public class MoreTypesTest { TypeElement mapElement = elements.getTypeElement(Map.class.getCanonicalName()); TypeElement setElement = elements.getTypeElement(Set.class.getCanonicalName()); TypeElement enumElement = elements.getTypeElement(Enum.class.getCanonicalName()); + TypeElement container = elements.getTypeElement(Container.class.getCanonicalName()); + TypeElement contained = elements.getTypeElement(Container.Contained.class.getCanonicalName()); TypeElement funkyBounds = elements.getTypeElement(FunkyBounds.class.getCanonicalName()); TypeElement funkyBounds2 = elements.getTypeElement(FunkyBounds2.class.getCanonicalName()); TypeElement funkierBounds = elements.getTypeElement(FunkierBounds.class.getCanonicalName()); @@ -82,12 +84,18 @@ public class MoreTypesTest { DeclaredType setOfSetOfSetOfObject = types.getDeclaredType(setElement, setOfSetOfObject); DeclaredType setOfSetOfSetOfString = types.getDeclaredType(setElement, setOfSetOfString); WildcardType wildcard = types.getWildcardType(null, null); + DeclaredType containerOfObject = types.getDeclaredType(container, objectType); + DeclaredType containerOfString = types.getDeclaredType(container, stringType); + TypeMirror containedInObject = types.asMemberOf(containerOfObject, contained); + TypeMirror containedInString = types.asMemberOf(containerOfString, contained); EquivalenceTester<TypeMirror> tester = EquivalenceTester.<TypeMirror>of(MoreTypes.equivalence()) .addEquivalenceGroup(types.getNullType()) .addEquivalenceGroup(types.getNoType(NONE)) .addEquivalenceGroup(types.getNoType(VOID)) .addEquivalenceGroup(objectType) .addEquivalenceGroup(stringType) + .addEquivalenceGroup(containedInObject) + .addEquivalenceGroup(containedInString) .addEquivalenceGroup(funkyBounds.asType()) .addEquivalenceGroup(funkyBounds2.asType()) .addEquivalenceGroup(funkierBounds.asType()) @@ -191,6 +199,11 @@ public class MoreTypesTest { } @SuppressWarnings("unused") + private static final class Container<T> { + private final class Contained {} + } + + @SuppressWarnings("unused") private static final class FunkyBounds<T extends Number & Comparable<T>> {} @SuppressWarnings("unused") |