Fix query-builder testcase name

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/src/vist/query-builder/tests/database.cpp b/src/vist/query-builder/tests/database.cpp
index 5e23ddb8f17f4b5d03c36fb1593183a6eda865cb..1ed52e9b2c6bff62faa64a7a063d5fc7b3e116b4 100644 (file)
--- a/src/vist/query-builder/tests/database.cpp
+++ b/src/vist/query-builder/tests/database.cpp
@@ -52,12 +52,12 @@ Database database { "database", table1, table2 };
 
 } // anonymous namespace
 
-TEST(DatabaseTests, size)
+TEST(QueryBuilderDatabaseTests, size)
 {
        EXPECT_EQ(database.size(), 2);
 }
 
-TEST(DatabaseTests, get_name)
+TEST(QueryBuilderDatabaseTests, get_name)
 {
        EXPECT_EQ(database.name, "database");
 
@@ -75,7 +75,7 @@ TEST(DatabaseTests, get_name)
        EXPECT_EQ(database.getColumnName(&Table2::column5), "table2.column5");
 }
 
-TEST(DatabaseTests, get_names)
+TEST(QueryBuilderDatabaseTests, get_names)
 {
        auto columns = database.getColumnNames(&Table1::column1, &Table2::column3);
        auto tables = database.getTableNames(&Table1::column1, &Table2::column1, &Table2::column1);

diff --git a/src/vist/query-builder/tests/query-builder.cpp b/src/vist/query-builder/tests/query-builder.cpp
index 65ae466ecb604dfaadbf2ea5a1b1237b6de9841b..165d41f8bd93c92354c0193197474248e9356149 100644 (file)
--- a/src/vist/query-builder/tests/query-builder.cpp
+++ b/src/vist/query-builder/tests/query-builder.cpp
@@ -60,9 +60,7 @@ Table policyDefinition { "policy_definition", Column("id", &PolicyDefinition::id
 
 Database db { "dpm", admin, managedPolicy, policyDefinition };
 
-class TsqbTests : public testing::Test {};
-
-TEST_F(TsqbTests, SELECT)
+TEST(QueryBuilderTsqbTests, SELECT)
 {
        std::string select1 = admin.select(&Admin::id, &Admin::pkg, &Admin::uid, &Admin::key);
        std::string select2 = admin.select(&Admin::id, &Admin::uid, &Admin::key);
@@ -71,14 +69,14 @@ TEST_F(TsqbTests, SELECT)
        EXPECT_EQ(select2, "SELECT id, uid, key FROM admin");
 }
 
-TEST_F(TsqbTests, SELECT_ALL)
+TEST(QueryBuilderTsqbTests, SELECT_ALL)
 {
        std::string select = admin.selectAll();
 
        EXPECT_EQ(select, "SELECT * FROM admin");
 }
 
-TEST_F(TsqbTests, SELECT_WHERE)
+TEST(QueryBuilderTsqbTests, SELECT_WHERE)
 {
        std::string select1 = admin.select(&Admin::uid, &Admin::key)
                                                           .where(expr(&Admin::id) > 3);
@@ -94,7 +92,7 @@ TEST_F(TsqbTests, SELECT_WHERE)
        EXPECT_EQ(select4, "SELECT * FROM admin WHERE uid > ? OR pkg = ?");
 }
 
-TEST_F(TsqbTests, SELECT_DISTINCT)
+TEST(QueryBuilderTsqbTests, SELECT_DISTINCT)
 {
        std::string select = admin.select(distinct(&Admin::uid, &Admin::key))
                                                           .where(expr(&Admin::id) > 3);
@@ -102,7 +100,7 @@ TEST_F(TsqbTests, SELECT_DISTINCT)
        EXPECT_EQ(select, "SELECT DISTINCT uid, key FROM admin WHERE id > ?");
 }
 
-TEST_F(TsqbTests, UPDATE)
+TEST(QueryBuilderTsqbTests, UPDATE)
 {
        int uid = 0, id = 1;
        std::string update1 = admin.update(&Admin::id, &Admin::pkg, &Admin::uid, &Admin::key);
@@ -116,7 +114,7 @@ TEST_F(TsqbTests, UPDATE)
        EXPECT_EQ(update3, "UPDATE admin SET key = ?, pkg = ? WHERE uid = ? AND id = ?");
 }
 
-TEST_F(TsqbTests, DELETE)
+TEST(QueryBuilderTsqbTests, DELETE)
 {
        std::string delete1 = admin.remove();
        std::string delete2 = admin.remove().where(expr(&Admin::pkg) == "dpm" &&
@@ -126,7 +124,7 @@ TEST_F(TsqbTests, DELETE)
        EXPECT_EQ(delete2, "DELETE FROM admin WHERE pkg = ? AND uid = ?");
 }
 
-TEST_F(TsqbTests, INSERT)
+TEST(QueryBuilderTsqbTests, INSERT)
 {
        std::string insert1 = admin.insert(&Admin::id, &Admin::pkg, &Admin::uid, &Admin::key);
        std::string insert2 = admin.insert(&Admin::id, &Admin::pkg, &Admin::key);
@@ -135,7 +133,7 @@ TEST_F(TsqbTests, INSERT)
        EXPECT_EQ(insert2, "INSERT INTO admin (id, pkg, key) VALUES (?, ?, ?)");
 }
 
-TEST_F(TsqbTests, TYPE_SAFE)
+TEST(QueryBuilderTsqbTests, TYPE_SAFE)
 {
 /*
  * Below cause complie error since expression types are dismatch.
@@ -150,7 +148,7 @@ TEST_F(TsqbTests, TYPE_SAFE)
 */
 }
 
-TEST_F(TsqbTests, MULTI_SELECT)
+TEST(QueryBuilderTsqbTests, MULTI_SELECT)
 {
        std::string multiSelect1 = db.select(&Admin::uid, &Admin::key,
                                                                                 &ManagedPolicy::id, &ManagedPolicy::value);
@@ -165,7 +163,7 @@ TEST_F(TsqbTests, MULTI_SELECT)
                                                        "WHERE admin.uid > ? AND managed_policy.id = ?");
 }
 
-TEST_F(TsqbTests, JOIN)
+TEST(QueryBuilderTsqbTests, JOIN)
 {
        std::string join1 = db.select(&Admin::uid, &Admin::key)
                                                  .join<PolicyDefinition>(condition::Join::LEFT_OUTER);

diff --git a/src/vist/query-builder/tests/table.cpp b/src/vist/query-builder/tests/table.cpp
index 038482a79ee5565913e7a74bae1ede072c6a5c4e..5ec2bdaa339e90c70c25f29546857b245054560b 100644 (file)
--- a/src/vist/query-builder/tests/table.cpp
+++ b/src/vist/query-builder/tests/table.cpp
@@ -49,13 +49,13 @@ Table table2 { "table2", Column("column1", &Table2::column1),
 
 } // anonymous namespace
 
-TEST(TableTests, size)
+TEST(QueryBuilderTableTests, size)
 {
        EXPECT_EQ(table1.size(), 3);
        EXPECT_EQ(table2.size(), 5);
 }
 
-TEST(TableTests, get_name)
+TEST(QueryBuilderTableTests, get_name)
 {
        EXPECT_EQ(table1.getName(), "table1");
        EXPECT_EQ(table2.name, "table2");
@@ -71,13 +71,13 @@ TEST(TableTests, get_name)
        EXPECT_EQ(table2.getColumnName(&Table2::column5), "column5");
 }
 
-TEST(TableTests, get_names)
+TEST(QueryBuilderTableTests, get_names)
 {
        EXPECT_EQ(table1.getColumnNames().size(), 3);
        EXPECT_EQ(table2.getColumnNames().size(), 5);
 }
 
-TEST(TableTests, compare)
+TEST(QueryBuilderTableTests, compare)
 {
        EXPECT_TRUE(table1.compare(Table1()));
 }