[gstreamermm] Tests: clean-ups in tests/*/*.h



commit 3ac9816c1e856d9cbedaad030d3496ec37c6904f
Author: Michał Wróbel <michal wrobel flytronic pl>
Date:   Sat Jun 27 20:27:11 2015 +0200

    Tests: clean-ups in tests/*/*.h
    
        * tests/plugins/foo.h:
        * tests/plugins/test-foo.h: rename test-foo.h to foo.h:
            - test-foo.h doesn't define any test, only the foo plugin,
            - to be consistent with tests/regression/pluginbin.h.
        * tests/plugins/test-plugin-register.cc: update include to foo.h.
        * tests/regression/pluginbin.h:
        * tests/regression/utils.h: uniform #include guard name template.

 tests/plugins/{test-foo.h => foo.h}   |   10 +++++-----
 tests/plugins/test-plugin-register.cc |    2 +-
 tests/regression/pluginbin.h          |    6 +++---
 tests/regression/utils.h              |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/tests/plugins/test-foo.h b/tests/plugins/foo.h
similarity index 93%
rename from tests/plugins/test-foo.h
rename to tests/plugins/foo.h
index ca4230e..39239fc 100644
--- a/tests/plugins/test-foo.h
+++ b/tests/plugins/foo.h
@@ -1,12 +1,12 @@
 /*
- * test-foo.h
+ * foo.h
  *
  *  Created on: Aug 1, 2013
  *      Author: m.kolny
  */
 
-#ifndef TEST_FOO_H_
-#define TEST_FOO_H_
+#ifndef TESTS_PLUGINS_FOO_H_
+#define TESTS_PLUGINS_FOO_H_
 
 #include <gstreamermm.h>
 #include <gstreamermm/private/element_p.h>
@@ -55,10 +55,10 @@ public:
 
     static bool register_foo(Glib::RefPtr<Gst::Plugin> plugin)
     {
-        Gst::ElementFactory::register_element(plugin, "foomm", 10, Gst::register_mm_type<Foo>("foomm"));
+        Gst::ElementFactory::register_element(plugin, "foomm", 10, Gst::register_mm_type<Foo>("foo"));
 
         return true;
     }
 };
 
-#endif /* TEST_FOO_H_ */
+#endif /* TESTS_PLUGINS_FOO_H_ */
diff --git a/tests/plugins/test-plugin-register.cc b/tests/plugins/test-plugin-register.cc
index ccb678c..14e485a 100644
--- a/tests/plugins/test-plugin-register.cc
+++ b/tests/plugins/test-plugin-register.cc
@@ -10,7 +10,7 @@
 #include <gstreamermm/appsink.h>
 #include <gstreamermm/appsrc.h>
 #include <vector>
-#include "test-foo.h"
+#include "foo.h"
 
 using namespace Gst;
 using Glib::RefPtr;
diff --git a/tests/regression/pluginbin.h b/tests/regression/pluginbin.h
index 26ee1b3..eab4b4f 100644
--- a/tests/regression/pluginbin.h
+++ b/tests/regression/pluginbin.h
@@ -5,8 +5,8 @@
  *      Author: loganek
  */
 
-#ifndef CUSTOMBIN_H_
-#define CUSTOMBIN_H_
+#ifndef TESTS_REGRESSION_PLUGINBIN_H_
+#define TESTS_REGRESSION_PLUGINBIN_H_
 
 #include <gstreamermm.h>
 #include <gstreamermm/private/bin_p.h>
@@ -70,4 +70,4 @@ public:
 
 
 
-#endif /* CUSTOMBIN_H_ */
+#endif /* TESTS_REGRESSION_PLUGINBIN_H_ */
diff --git a/tests/regression/utils.h b/tests/regression/utils.h
index d92a757..f3cc0f4 100644
--- a/tests/regression/utils.h
+++ b/tests/regression/utils.h
@@ -5,12 +5,12 @@
  *      Author: m.kolny
  */
 
-#ifndef UTILS_H_
-#define UTILS_H_
+#ifndef TESTS_REGRESSION_UTILS_H_
+#define TESTS_REGRESSION_UTILS_H_
 
 #include <gstreamermm.h>
 #include <fstream>
 
 void GenerateSampleOggFile(int num_buffers, const Glib::ustring& filename);
 bool FilesEqual(const std::string& filename1, const std::string& filename2);
-#endif /* UTILS_H_ */
+#endif /* TESTS_REGRESSION_UTILS_H_ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]