From 3ab938a60152cc24c277b65db0d20172721ccd23 Mon Sep 17 00:00:00 2001
From: Tobias Fuchs <fuchs.tobias.ext@siemens.com>
Date: Mon, 2 Feb 2015 14:37:54 +0100
Subject: [PATCH] base_c, base_cpp, containers: fixed inconsistent naming of unit test cases

---
 base_c/test/main.cc         | 31 +++++++++++++++++++++----------
 base_cpp/test/main.cc       | 25 +++++++++++++++++--------
 containers_cpp/test/main.cc | 46 +++++++++++++++++++++++-----------------------
 3 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/base_c/test/main.cc b/base_c/test/main.cc
index eb0dc83..3e1d70a 100644
--- a/base_c/test/main.cc
+++ b/base_c/test/main.cc
@@ -41,22 +41,33 @@
 
 #include <embb/base/c/memory_allocation.h>
 
+using embb::base::test::AllocTest;
+using embb::base::test::DurationTest;
+using embb::base::test::TimeTest;
+using embb::base::test::CounterTest;
+using embb::base::test::MutexTest;
+using embb::base::test::ThreadIndexTest;
+using embb::base::test::CoreSetTest;
+using embb::base::test::ConditionVarTest;
+using embb::base::test::ThreadTest;
+using embb::base::test::ThreadSpecificStorageTest;
+
 PT_MAIN("Base C") {
   embb_log_set_log_level(EMBB_LOG_LEVEL_WARNING);
   unsigned int max_threads =
       static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
   embb_thread_set_max_count(max_threads);
 
-  PT_RUN(embb::base::test::AllocTest);
-  PT_RUN(embb::base::test::DurationTest);
-  PT_RUN(embb::base::test::TimeTest);
-  PT_RUN(embb::base::test::CounterTest);
-  PT_RUN(embb::base::test::MutexTest);
-  PT_RUN(embb::base::test::ThreadIndexTest);
-  PT_RUN(embb::base::test::CoreSetTest);
-  PT_RUN(embb::base::test::ConditionVarTest);
-  PT_RUN(embb::base::test::ThreadTest);
-  PT_RUN(embb::base::test::ThreadSpecificStorageTest);
+  PT_RUN(AllocTest);
+  PT_RUN(DurationTest);
+  PT_RUN(TimeTest);
+  PT_RUN(CounterTest);
+  PT_RUN(MutexTest);
+  PT_RUN(ThreadIndexTest);
+  PT_RUN(CoreSetTest);
+  PT_RUN(ConditionVarTest);
+  PT_RUN(ThreadTest);
+  PT_RUN(ThreadSpecificStorageTest);
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
 }
diff --git a/base_cpp/test/main.cc b/base_cpp/test/main.cc
index 6184ee8..b621a4d 100644
--- a/base_cpp/test/main.cc
+++ b/base_cpp/test/main.cc
@@ -37,18 +37,27 @@
 
 #include <embb/base/c/memory_allocation.h>
 
+using embb::base::test::CoreSetTest;
+using embb::base::test::DurationTest;
+using embb::base::test::ConditionVarTest;
+using embb::base::test::MutexTest;
+using embb::base::test::ThreadSpecificStorageTest;
+using embb::base::test::AtomicTest;
+using embb::base::test::MemoryAllocationTest;
+using embb::base::test::ThreadTest;
+
 PT_MAIN("Base C++") {
   unsigned int max_threads =
       static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
   embb_thread_set_max_count(max_threads);
-  PT_RUN(embb::base::test::CoreSetTest);
-  PT_RUN(embb::base::test::DurationTest);
-  PT_RUN(embb::base::test::ConditionVarTest);
-  PT_RUN(embb::base::test::MutexTest);
-  PT_RUN(embb::base::test::ThreadSpecificStorageTest);
-  PT_RUN(embb::base::test::AtomicTest);
-  PT_RUN(embb::base::test::MemoryAllocationTest);
-  PT_RUN(embb::base::test::ThreadTest);
+  PT_RUN(CoreSetTest);
+  PT_RUN(DurationTest);
+  PT_RUN(ConditionVarTest);
+  PT_RUN(MutexTest);
+  PT_RUN(ThreadSpecificStorageTest);
+  PT_RUN(AtomicTest);
+  PT_RUN(MemoryAllocationTest);
+  PT_RUN(ThreadTest);
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
 }
diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc
index 21dbe61..660ea4f 100644
--- a/containers_cpp/test/main.cc
+++ b/containers_cpp/test/main.cc
@@ -43,33 +43,33 @@
 
 #define COMMA ,
 
+using embb::containers::WaitFreeArrayValuePool;
+using embb::containers::LockFreeTreeValuePool;
+using embb::containers::WaitFreeSPSCQueue;
+using embb::containers::LockFreeMPMCQueue;
+using embb::containers::LockFreeStack;
+using embb::containers::LockFreeTreeValuePool;
+using embb::containers::WaitFreeArrayValuePool;
+using embb::containers::test::PoolTest;
+using embb::containers::test::HazardPointerTest;
+using embb::containers::test::QueueTest;
+using embb::containers::test::StackTest;
+using embb::containers::test::ObjectPoolTest;
+
 PT_MAIN("Data Structures C++") {
-  unsigned int max_threads =
-      static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
+  unsigned int max_threads = static_cast<unsigned int>(
+    2 * partest::TestSuite::GetDefaultNumThreads());
   embb_thread_set_max_count(max_threads);
 
-  PT_RUN(embb::containers::test::PoolTest<
-    embb::containers::WaitFreeArrayValuePool<int COMMA -1> >);
-  PT_RUN(embb::containers::test::PoolTest<
-    embb::containers::LockFreeTreeValuePool<int COMMA -1> >);
-
-  PT_RUN(embb::containers::test::HazardPointerTest);
-
-  PT_RUN(embb::containers::test::QueueTest< 
-    embb::containers::WaitFreeSPSCQueue< ::std::pair<size_t COMMA int> > >);
-
-  PT_RUN(embb::containers::test::QueueTest< 
-    embb::containers::LockFreeMPMCQueue< ::std::pair<size_t COMMA int> > 
+  PT_RUN(PoolTest< WaitFreeArrayValuePool<int COMMA -1> >);
+  PT_RUN(PoolTest< LockFreeTreeValuePool<int COMMA -1> >);
+  PT_RUN(HazardPointerTest);
+  PT_RUN(QueueTest< WaitFreeSPSCQueue< ::std::pair<size_t COMMA int> > >);
+  PT_RUN(QueueTest< LockFreeMPMCQueue< ::std::pair<size_t COMMA int> >
     COMMA true COMMA true >);
-
-  PT_RUN(embb::containers::test::StackTest<
-    embb::containers::LockFreeStack<int> >);
-
-  PT_RUN(embb::containers::test::ObjectPoolTest
-    <embb::containers::LockFreeTreeValuePool<bool COMMA false > >);
-
-  PT_RUN(embb::containers::test::ObjectPoolTest
-    <embb::containers::WaitFreeArrayValuePool<bool COMMA false> >);
+  PT_RUN(StackTest< LockFreeStack<int> >);
+  PT_RUN(ObjectPoolTest< LockFreeTreeValuePool<bool COMMA false > >);
+  PT_RUN(ObjectPoolTest< WaitFreeArrayValuePool<bool COMMA false> >);
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
 }
--
libgit2 0.26.0