@@ -33,9 +33,9 @@ namespace test {
33
33
// Catalog Tests
34
34
// ===--------------------------------------------------------------------===//
35
35
36
- class CatalogTests : public PelotonTest {};
36
+ class CatalogTests : public PelotonTests {};
37
37
38
- TEST_F (CatalogTests, BootstrappingCatalog ) {
38
+ TEST_F (CatalogTests, BootstrappingCatalogTest ) {
39
39
auto catalog = catalog::Catalog::GetInstance ();
40
40
catalog->Bootstrap ();
41
41
EXPECT_EQ (1 , storage::StorageManager::GetInstance ()->GetDatabaseCount ());
@@ -52,7 +52,7 @@ TEST_F(CatalogTests, BootstrappingCatalog) {
52
52
EXPECT_NE (nullptr , db_metric_table);
53
53
}
54
54
//
55
- TEST_F (CatalogTests, CreatingDatabase ) {
55
+ TEST_F (CatalogTests, CreatingDatabaseTest ) {
56
56
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance ();
57
57
auto txn = txn_manager.BeginTransaction ();
58
58
catalog::Catalog::GetInstance ()->CreateDatabase (" emp_db" , txn);
@@ -62,7 +62,7 @@ TEST_F(CatalogTests, CreatingDatabase) {
62
62
txn_manager.CommitTransaction (txn);
63
63
}
64
64
65
- TEST_F (CatalogTests, CreatingTable ) {
65
+ TEST_F (CatalogTests, CreatingTableTest ) {
66
66
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance ();
67
67
auto txn = txn_manager.BeginTransaction ();
68
68
auto id_column = catalog::Column (
@@ -120,7 +120,7 @@ TEST_F(CatalogTests, CreatingTable) {
120
120
txn_manager.CommitTransaction (txn);
121
121
}
122
122
123
- TEST_F (CatalogTests, TableObject ) {
123
+ TEST_F (CatalogTests, TableObjectTest ) {
124
124
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance ();
125
125
auto txn = txn_manager.BeginTransaction ();
126
126
@@ -168,7 +168,7 @@ TEST_F(CatalogTests, TableObject) {
168
168
txn_manager.CommitTransaction (txn);
169
169
}
170
170
171
- TEST_F (CatalogTests, TestingNamespace ) {
171
+ TEST_F (CatalogTests, ingNamespaceTest ) {
172
172
EXPECT_EQ (ResultType::SUCCESS, TestingSQLUtil::ExecuteSQLQuery (" begin;" ));
173
173
// create namespaces emp_ns0 and emp_ns1
174
174
EXPECT_EQ (ResultType::SUCCESS, TestingSQLUtil::ExecuteSQLQuery (
@@ -231,7 +231,7 @@ TEST_F(CatalogTests, TestingNamespace) {
231
231
EXPECT_EQ (ResultType::ABORTED, TestingSQLUtil::ExecuteSQLQuery (" commit;" ));
232
232
}
233
233
234
- TEST_F (CatalogTests, DroppingTable ) {
234
+ TEST_F (CatalogTests, DroppingTableTest ) {
235
235
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance ();
236
236
auto txn = txn_manager.BeginTransaction ();
237
237
auto catalog = catalog::Catalog::GetInstance ();
@@ -293,7 +293,7 @@ TEST_F(CatalogTests, DroppingTable) {
293
293
txn_manager.CommitTransaction (txn);
294
294
}
295
295
296
- TEST_F (CatalogTests, DroppingDatabase ) {
296
+ TEST_F (CatalogTests, DroppingDatabaseTest ) {
297
297
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance ();
298
298
auto txn = txn_manager.BeginTransaction ();
299
299
catalog::Catalog::GetInstance ()->DropDatabaseWithName (" emp_db" , txn);
@@ -304,7 +304,7 @@ TEST_F(CatalogTests, DroppingDatabase) {
304
304
txn_manager.CommitTransaction (txn);
305
305
}
306
306
307
- TEST_F (CatalogTests, DroppingCatalog ) {
307
+ TEST_F (CatalogTests, DroppingCatalogTest ) {
308
308
auto catalog = catalog::Catalog::GetInstance ();
309
309
EXPECT_NE (nullptr , catalog);
310
310
}
0 commit comments