Merge "tests/compression: rewrite" into main

tests/unit/libutil/compression.cc

@@ -7,67 +7,100 @@ namespace nix {
  * compress / decompress
  * --------------------------------------------------------------------------*/
 
-    TEST(compress, compressWithUnknownMethod) {
+TEST(compress, compressWithUnknownMethod)
+{
     ASSERT_THROW(compress("invalid-method", "something-to-compress"), UnknownCompressionMethod);
 }
 
-    TEST(compress, noneMethodDoesNothingToTheInput) {
+TEST(compress, noneMethodDoesNothingToTheInput)
+{
     auto o = compress("none", "this-is-a-test");
 
     ASSERT_EQ(o, "this-is-a-test");
 }
 
-    TEST(decompress, decompressNoneCompressed) {
+TEST(decompress, decompressEmptyString)
-        auto method = "none";
+{
-        auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
-        auto o = decompress(method, str);
-
-        ASSERT_EQ(o, str);
-    }
-
-    TEST(decompress, decompressEmptyCompressed) {
     // Empty-method decompression used e.g. by S3 store
     // (Content-Encoding == "").
-        auto method = "";
+    auto o = decompress("", "this-is-a-test");
-        auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
-        auto o = decompress(method, str);
 
-        ASSERT_EQ(o, str);
+    ASSERT_EQ(o, "this-is-a-test");
 }
 
-    TEST(decompress, decompressXzCompressed) {
+/* ----------------------------------------------------------------------------
-        auto method = "xz";
+ * compression sinks
+ * --------------------------------------------------------------------------*/
+
+TEST(makeCompressionSink, noneSinkDoesNothingToInput)
+{
+    auto method = "none";
+    StringSink strSink;
+    auto inputString = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
+    auto sink = makeCompressionSink(method, strSink);
+    (*sink)(inputString);
+    sink->finish();
+
+    ASSERT_STREQ(strSink.s.c_str(), inputString);
+}
+
+/** Tests applied to all compression types */
+class PerTypeCompressionTest : public testing::TestWithParam<const char *>
+{};
+
+/** Tests applied to non-passthrough compression types */
+class PerTypeNonNullCompressionTest : public testing::TestWithParam<const char *>
+{};
+
+constexpr const char * COMPRESSION_TYPES_NONNULL[] = {
+    // libarchive
+    "bzip2",
+    "compress",
+    "gzip",
+    "lzip",
+    "lzma",
+    "xz",
+    "zstd",
+    // Uses external program via libarchive so cannot be used :(
+    /*
+    "grzip",
+    "lrzip",
+    "lzop",
+    "lz4",
+    */
+    // custom
+    "br",
+};
+
+INSTANTIATE_TEST_SUITE_P(
+    compressionNonNull, PerTypeNonNullCompressionTest, testing::ValuesIn(COMPRESSION_TYPES_NONNULL)
+);
+INSTANTIATE_TEST_SUITE_P(
+    compressionNonNull, PerTypeCompressionTest, testing::ValuesIn(COMPRESSION_TYPES_NONNULL)
+);
+
+INSTANTIATE_TEST_SUITE_P(
+    compressionNull, PerTypeCompressionTest, testing::Values("none")
+);
+
+/* ---------------------------------------
+ * All compression types
+ * --------------------------------------- */
+
+TEST_P(PerTypeCompressionTest, roundTrips)
+{
+    auto method = GetParam();
     auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
     auto o = decompress(method, compress(method, str));
 
     ASSERT_EQ(o, str);
 }
 
-    TEST(decompress, decompressBzip2Compressed) {
+TEST_P(PerTypeCompressionTest, longerThanBuffer)
-        auto method = "bzip2";
+{
-        auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
+    // This is targeted originally at regression testing a brotli bug, but we might as well do it to
-        auto o = decompress(method, compress(method, str));
+    // everything
-
+    auto method = GetParam();
-        ASSERT_EQ(o, str);
-    }
-
-    TEST(decompress, decompressBrCompressed) {
-        auto method = "br";
-        auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
-        auto o = decompress(method, compress(method, str));
-
-        ASSERT_EQ(o, str);
-    }
-
-    TEST(decompress, decompressInvalidInputThrowsCompressionError) {
-        auto method = "bzip2";
-        auto str = "this is a string that does not qualify as valid bzip2 data";
-
-        ASSERT_THROW(decompress(method, str), CompressionError);
-    }
-
-    TEST(decompress, veryLongBrotli) {
-        auto method = "br";
     auto str = std::string(65536, 'a');
     auto o = decompress(method, compress(method, str));
 
@@ -76,32 +109,31 @@ namespace nix {
     ASSERT_EQ(o, str);
 }
 
-    /* ----------------------------------------------------------------------------
+TEST_P(PerTypeCompressionTest, sinkAndSource)
-     * compression sinks
+{
-     * --------------------------------------------------------------------------*/
+    auto method = GetParam();
-
-    TEST(makeCompressionSink, noneSinkDoesNothingToInput) {
-        StringSink strSink;
-        auto inputString = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
-        auto sink = makeCompressionSink("none", strSink);
-        (*sink)(inputString);
-        sink->finish();
-
-        ASSERT_STREQ(strSink.s.c_str(), inputString);
-    }
-
-    TEST(makeCompressionSink, compressAndDecompress) {
     auto inputString = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
 
     StringSink strSink;
-        auto sink = makeCompressionSink("bzip2", strSink);
+    auto sink = makeCompressionSink(method, strSink);
     (*sink)(inputString);
     sink->finish();
 
     StringSource strSource{strSink.s};
-        auto decompressionSource = makeDecompressionSource("bzip2", strSource);
+    auto decompressionSource = makeDecompressionSource(method, strSource);
 
     ASSERT_STREQ(decompressionSource->drain().c_str(), inputString);
 }
 
+/* ---------------------------------------
+ * Non null compression types
+ * --------------------------------------- */
+
+TEST_P(PerTypeNonNullCompressionTest, bogusInputDecompression)
+{
+    auto param = GetParam();
+
+    auto bogus = "this data is bogus and should throw when decompressing";
+    ASSERT_THROW(decompress(param, bogus), CompressionError);
+}
 }