Combiners overhaul: introduce Combiner interface common to all combiners, use it instead of switch statement in output_jar. Move implementations to combiners.cc

--
MOS_MIGRATED_REVID=129763019

1 files changed, 11 insertions, 0 deletions

diff --git a/src/tools/singlejar/combiners_test.cc b/src/tools/singlejar/combiners_test.cc
index 9b6701c9ea..f6da247721 100644
--- a/src/tools/singlejar/combiners_test.cc
+++ b/src/tools/singlejar/combiners_test.cc
@@ -118,6 +118,13 @@ TEST_F(CombinersTest, ConcatenatorHuge) {
   free(reinterpret_cast<void *>(entry));
 }
 
+// Test NullCombiner.
+TEST_F(CombinersTest, NullCombiner) {
+  NullCombiner null_combiner;
+  ASSERT_TRUE(null_combiner.Merge(nullptr, nullptr));
+  ASSERT_EQ(nullptr, null_combiner.OutputEntry());
+}
+
 // Test XmlCombiner.
 TEST_F(CombinersTest, XmlCombiner) {
   InputJar input_jar;
@@ -155,6 +162,7 @@ TEST_F(CombinersTest, XmlCombiner) {
 
   free(reinterpret_cast<void *>(entry));
 }
+
 // Test PropertyCombiner.
 TEST_F(CombinersTest, PropertyCombiner) {
   static char kProperties[] =
@@ -165,6 +173,9 @@ TEST_F(CombinersTest, PropertyCombiner) {
   property_combiner.AddProperty(std::string("name_str"),
                                 std::string("value_str"));
 
+  // Merge should not be called.
+  ASSERT_FALSE(property_combiner.Merge(nullptr, nullptr));
+
   // Create output, verify Local Header contents.
   LH *entry = reinterpret_cast<LH *>(property_combiner.OutputEntry());
   EXPECT_TRUE(entry->is());