diff options
Diffstat (limited to 'src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/DepsCheckerClassVisitorTest.java')
-rw-r--r-- | src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/DepsCheckerClassVisitorTest.java | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/DepsCheckerClassVisitorTest.java b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/DepsCheckerClassVisitorTest.java index fcffb98c21..196a072721 100644 --- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/DepsCheckerClassVisitorTest.java +++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/DepsCheckerClassVisitorTest.java @@ -78,21 +78,26 @@ public class DepsCheckerClassVisitorTest extends AbstractClassCacheTest { libraryExceptionJar, clientJar); assertThat(collector.getSortedMissingClassInternalNames()).isEmpty(); - assertThat(collector.getSortedMissingMembers()) + assertThat( + collector + .getSortedMissingMembers() + .stream() + .map(DepsCheckerClassVisitorTest::constructFullQualifiedMemberName) + .collect(ImmutableList.toImmutableList())) .containsExactly( - MissingMember.create( + constructFullyQualifiedMemberName( "com/google/devtools/build/importdeps/testdata/Library$Class1", "I", "Lcom/google/devtools/build/importdeps/testdata/Library$Class1;"), - MissingMember.create( + constructFullyQualifiedMemberName( "com/google/devtools/build/importdeps/testdata/Library$Class3", "field", "Lcom/google/devtools/build/importdeps/testdata/Library$Class4;"), - MissingMember.create( + constructFullyQualifiedMemberName( "com/google/devtools/build/importdeps/testdata/Library$Class4", "createClass5", "()Lcom/google/devtools/build/importdeps/testdata/Library$Class5;"), - MissingMember.create( + constructFullyQualifiedMemberName( "com/google/devtools/build/importdeps/testdata/Library$Class5", "create", "(Lcom/google/devtools/build/importdeps/testdata/Library$Class7;)" @@ -100,6 +105,16 @@ public class DepsCheckerClassVisitorTest extends AbstractClassCacheTest { .inOrder(); } + private static String constructFullQualifiedMemberName(MissingMember member) { + return constructFullyQualifiedMemberName( + member.owner().internalName(), member.memberName(), member.descriptor()); + } + + private static String constructFullyQualifiedMemberName( + String owner, String memberName, String descriptor) { + return owner + memberName + descriptor; + } + private ImmutableList<String> getMissingClassesInClient(Path... classpath) throws IOException { ResultCollector resultCollector = getResultCollector(classpath); return resultCollector.getSortedMissingClassInternalNames(); |