diff options
author | kmb <kmb@google.com> | 2017-10-21 04:07:24 +0200 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2017-10-23 17:16:19 +0200 |
commit | db1426b75d7721554a8b139696b5b4c400a260a5 (patch) | |
tree | 03d407f62851fa8e179e1f6c2745ad5826d71a4c /src/tools/singlejar/combiners_test.cc | |
parent | 9cc97513839442ac13fe10ab84e103e127e36987 (diff) |
Exclude Android dependency checking from Bazel's singlejar build.
This should also address https://github.com/bazelbuild/bazel/issues/3903
RELNOTES: None.
PiperOrigin-RevId: 172963663
Diffstat (limited to 'src/tools/singlejar/combiners_test.cc')
-rw-r--r-- | src/tools/singlejar/combiners_test.cc | 71 |
1 files changed, 3 insertions, 68 deletions
diff --git a/src/tools/singlejar/combiners_test.cc b/src/tools/singlejar/combiners_test.cc index effdf265be..b1dd75f7b1 100644 --- a/src/tools/singlejar/combiners_test.cc +++ b/src/tools/singlejar/combiners_test.cc @@ -19,6 +19,8 @@ #include "src/tools/singlejar/zlib_interface.h" #include "gtest/gtest.h" +namespace { + static const char kTag1Contents[] = "<tag1>Contents1</tag1>"; static const char kTag2Contents[] = "<tag2>Contents2</tag2>"; static const char kCombinedXmlContents[] = @@ -49,67 +51,6 @@ class CombinersTest : public ::testing::Test { } return true; } - - static void TestJava8DesugarDepsChecker_HasDefaultMethods() { - Java8DesugarDepsChecker checker([](const std::string &) { return false; }, - /*verbose=*/false); - checker.has_default_methods_["a"] = true; - checker.extended_interfaces_["c"] = {"b", "a"}; - - // Induce cycle (shouldn't happen but make sure we don't crash) - checker.extended_interfaces_["d"] = {"e"}; - checker.extended_interfaces_["e"] = {"d", "a"}; - - EXPECT_TRUE(checker.HasDefaultMethods("a")); - EXPECT_FALSE(checker.HasDefaultMethods("b")); - EXPECT_TRUE(checker.HasDefaultMethods("c")); // Transitivly through a - EXPECT_TRUE(checker.HasDefaultMethods("d")); // Transitivly through a - EXPECT_FALSE(checker.error_); - } - - static void TestJava8DesugarDepsChecker_OutputEntry() { - bool checkedA = false; - Java8DesugarDepsChecker checker( - [&checkedA](const std::string &binary_name) { - checkedA = true; - return binary_name == "a$$CC.class"; - }, - /*verbose=*/false); - checker.has_default_methods_["a"] = true; - checker.extended_interfaces_["b"] = {"c", "d"}; - checker.extended_interfaces_["c"] = {"e"}; - checker.needed_deps_["a$$CC.class"] = "f"; - checker.missing_interfaces_["b"] = "g"; - EXPECT_EQ(nullptr, checker.OutputEntry(/*compress=*/true)); - EXPECT_TRUE(checkedA); - - // Make sure we checked b and its extended interfaces for default methods - EXPECT_FALSE(checker.has_default_methods_.at("b")); // should be cached - EXPECT_FALSE(checker.has_default_methods_.at("c")); // should be cached - EXPECT_FALSE(checker.has_default_methods_.at("d")); // should be cached - EXPECT_FALSE(checker.has_default_methods_.at("e")); // should be cached - EXPECT_FALSE(checker.error_); - } - - static void TestJava8DesugarDepsChecker_NeededDepMissing() { - Java8DesugarDepsChecker checker([](const std::string &) { return false; }, - /*verbose=*/false, - /*fail_on_error=*/false); - checker.needed_deps_["a$$CC.class"] = "b"; - EXPECT_EQ(nullptr, checker.OutputEntry(/*compress=*/true)); - EXPECT_TRUE(checker.error_); - } - - static void TestJava8DesugarDepsChecker_MissedDefaultMethods() { - Java8DesugarDepsChecker checker([](const std::string &) { return true; }, - /*verbose=*/false, - /*fail_on_error=*/false); - checker.has_default_methods_["b"] = true; - checker.extended_interfaces_["a"] = {"b", "a"}; - checker.missing_interfaces_["a"] = "g"; - EXPECT_EQ(nullptr, checker.OutputEntry(/*compress=*/true)); - EXPECT_TRUE(checker.error_); - } }; // Test Concatenator. @@ -305,10 +246,4 @@ TEST_F(CombinersTest, PropertyCombiner) { free(reinterpret_cast<void *>(entry)); } -TEST_F(CombinersTest, Java8DesugarDepsChecker) { - // Tests are instance methods of CombinersTest to avoid gUnit dep in .h file. - TestJava8DesugarDepsChecker_HasDefaultMethods(); - TestJava8DesugarDepsChecker_OutputEntry(); - TestJava8DesugarDepsChecker_NeededDepMissing(); - TestJava8DesugarDepsChecker_MissedDefaultMethods(); -} +} // anonymous namespace |