unittest_compression: subsume plugin test

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/test/compressor/CMakeLists.txt b/src/test/compressor/CMakeLists.txt
index 7e73515964026a2ffa3859b2aaaf02ac79a46532..bf63e7e2eaf4bded1fcb9b72105580fb1d5977dc 100644 (file)
--- a/src/test/compressor/CMakeLists.txt
+++ b/src/test/compressor/CMakeLists.txt
@@ -7,12 +7,3 @@ add_executable(unittest_compression
 add_ceph_unittest(unittest_compression ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression)
 target_link_libraries(unittest_compression global)
 add_dependencies(unittest_compression ceph_example)
-
-# unittest_compression_plugin
-add_executable(unittest_compression_plugin
-  test_compression_plugin.cc
-  )
-add_ceph_unittest(unittest_compression_plugin ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression_plugin)
-target_link_libraries(unittest_compression_plugin global)
-add_dependencies(unittest_compression_plugin ceph_example)
-

diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc
index 2c81c3f6f61c97ec55758f3547e9bb6546ef1553..22e35c674159ab0684c89db10bc09144e8d6e841 100644 (file)
--- a/src/test/compressor/test_compression.cc
+++ b/src/test/compressor/test_compression.cc
@@ -23,6 +23,7 @@
 #include "common/ceph_argparse.h"
 #include "global/global_context.h"
 #include "common/config.h"
+#include "compressor/CompressionPlugin.h"
 
 class CompressionTest : public ::testing::Test,
                        public ::testing::WithParamInterface<const char*> {
@@ -356,6 +357,28 @@ TEST(ZlibCompressor, zlib_isal_compatibility)
   EXPECT_TRUE(exp.contents_equal(after));
 }
 
+TEST(CompressionPlugin, all)
+{
+  const char* env = getenv("CEPH_LIB");
+  std::string directory(env ? env : ".libs");
+  CompressorRef compressor;
+  PluginRegistry *reg = g_ceph_context->get_plugin_registry();
+  EXPECT_TRUE(reg);
+  CompressionPlugin *factory = dynamic_cast<CompressionPlugin*>(reg->get_with_load("compressor", "invalid"));
+  EXPECT_FALSE(factory);
+  factory = dynamic_cast<CompressionPlugin*>(reg->get_with_load("compressor", "example"));
+  EXPECT_TRUE(factory);
+  stringstream ss;
+  EXPECT_EQ(0, factory->factory(&compressor, &ss));
+  EXPECT_TRUE(compressor.get());
+  {
+    Mutex::Locker l(reg->lock);
+    EXPECT_EQ(-ENOENT, reg->remove("compressor", "does not exist"));
+    EXPECT_EQ(0, reg->remove("compressor", "example"));
+    EXPECT_EQ(0, reg->load("compressor", "example"));
+  }
+}
+
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);

diff --git a/src/test/compressor/test_compression_plugin.cc b/src/test/compressor/test_compression_plugin.cc
deleted file mode 100644 (file)
index c45fab8..0000000
--- a/src/test/compressor/test_compression_plugin.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph distributed storage system
- *
- * Copyright (C) 2015 Mirantis, Inc.
- *
- * Author: Alyona Kiseleva <akiselyova@mirantis.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- * 
- */
-
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtest/gtest.h>
-#include "global/global_init.h"
-#include "compressor/CompressionPlugin.h"
-#include "common/ceph_argparse.h"
-#include "global/global_context.h"
-#include "common/config.h"
-
-TEST(CompressionPlugin, all)
-{
-  const char* env = getenv("CEPH_LIB");
-  std::string directory(env ? env : ".libs");
-  CompressorRef compressor;
-  PluginRegistry *reg = g_ceph_context->get_plugin_registry();
-  EXPECT_TRUE(reg);
-  CompressionPlugin *factory = dynamic_cast<CompressionPlugin*>(reg->get_with_load("compressor", "invalid"));
-  EXPECT_FALSE(factory);
-  factory = dynamic_cast<CompressionPlugin*>(reg->get_with_load("compressor", "example"));
-  EXPECT_TRUE(factory);
-  stringstream ss;
-  EXPECT_EQ(0, factory->factory(&compressor, &ss));
-  EXPECT_TRUE(compressor.get());
-  {
-    Mutex::Locker l(reg->lock);
-    EXPECT_EQ(-ENOENT, reg->remove("compressor", "does not exist"));
-    EXPECT_EQ(0, reg->remove("compressor", "example"));
-    EXPECT_EQ(0, reg->load("compressor", "example"));
-  }
-}
-
-int main(int argc, char **argv) {
-  vector<const char*> args;
-  argv_to_vec(argc, (const char **)argv, args);
-
-  global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
-  common_init_finish(g_ceph_context);
-
-  const char* env = getenv("CEPH_LIB");
-  if (env)
-    g_conf->set_val("plugin_dir", env, false, false);
-
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-
-/*
- * Local Variables:
- * compile-command: "cd ../.. ; make -j4 && 
- *   make unittest_compression_plugin && 
- *   valgrind --tool=memcheck \
- *      ./unittest_compression_plugin \
- *      --gtest_filter=*.* --log-to-stderr=true --debug-osd=20"
- * End:
- */