Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 3b54ec1

Browse files
schedutrontcm-marcel
schedutron
authored and
tcm-marcel
committed
Fix test naming
1 parent 6591523 commit 3b54ec1

File tree

176 files changed

+917
-799
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+917
-799
lines changed

‎test/binder/binder_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using std::vector;
3737
namespace peloton {
3838
namespace test {
3939

40-
class BinderCorrectnessTest : public PelotonTest {
40+
class BinderCorrectnessTests : public PelotonTests {
4141
virtual void SetUp() override {
4242
PelotonTest::SetUp();
4343
catalog::Catalog::GetInstance();
@@ -101,7 +101,7 @@ void SetupTables(std::string database_name) {
101101
}
102102
}
103103

104-
TEST_F(BinderCorrectnessTest, SelectStatementTest) {
104+
TEST_F(BinderCorrectnessTests, SelectStatementTest) {
105105
std::string default_database_name = "test_db";
106106
SetupTables(default_database_name);
107107
auto &parser = parser::PostgresParser::GetInstance();
@@ -250,7 +250,7 @@ TEST_F(BinderCorrectnessTest, SelectStatementTest) {
250250
// instead of TupleValueExpression to represent column. We can only add this
251251
// test after UpdateStatement is changed
252252

253-
TEST_F(BinderCorrectnessTest, DeleteStatementTest) {
253+
TEST_F(BinderCorrectnessTests, DeleteStatementTest) {
254254
std::string default_database_name = "test_db";
255255
SetupTables(default_database_name);
256256
auto &parser = parser::PostgresParser::GetInstance();
@@ -292,7 +292,7 @@ TEST_F(BinderCorrectnessTest, DeleteStatementTest) {
292292
txn_manager.CommitTransaction(txn);
293293
}
294294

295-
TEST_F(BinderCorrectnessTest, BindDepthTest) {
295+
TEST_F(BinderCorrectnessTests, BindDepthTest) {
296296
std::string default_database_name = "test_db";
297297
SetupTables(default_database_name);
298298
auto &parser = parser::PostgresParser::GetInstance();
@@ -382,7 +382,7 @@ TEST_F(BinderCorrectnessTest, BindDepthTest) {
382382
txn_manager.CommitTransaction(txn);
383383
}
384384

385-
TEST_F(BinderCorrectnessTest, FunctionExpressionTest) {
385+
TEST_F(BinderCorrectnessTests, FunctionExpressionTest) {
386386
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
387387
auto txn = txn_manager.BeginTransaction();
388388

‎test/brain/query_clusterer_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bool ClusterCorrectness(std::set<brain::Cluster *> clusters,
5252
return check;
5353
}
5454

55-
class QueryClustererTests : public PelotonTest {};
55+
class QueryClustererTests : public PelotonTests {};
5656

5757
TEST_F(QueryClustererTests, ClusterTest) {
5858
int num_features = 5;

‎test/brain/query_logger_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace peloton {
2020
namespace test {
2121

22-
class QueryLoggerTests : public PelotonTest {
22+
class QueryLoggerTests : public PelotonTests {
2323
protected:
2424
void SetUp() override {
2525
settings::SettingsManager::SetBool(settings::SettingId::brain, true);

‎test/brain/tensorflow_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace test {
2626
// Tensorflow Tests
2727
//===--------------------------------------------------------------------===//
2828

29-
class TensorflowTests : public PelotonTest {};
29+
class TensorflowTests : public PelotonTests {};
3030

3131
TEST_F(TensorflowTests, BasicTFTest) {
3232
// Check that the tensorflow library imports and prints version info correctly

‎test/catalog/catalog_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ namespace test {
3333
// Catalog Tests
3434
//===--------------------------------------------------------------------===//
3535

36-
class CatalogTests : public PelotonTest {};
36+
class CatalogTests : public PelotonTests {};
3737

38-
TEST_F(CatalogTests, BootstrappingCatalog) {
38+
TEST_F(CatalogTests, BootstrappingCatalogTest) {
3939
auto catalog = catalog::Catalog::GetInstance();
4040
catalog->Bootstrap();
4141
EXPECT_EQ(1, storage::StorageManager::GetInstance()->GetDatabaseCount());
@@ -52,7 +52,7 @@ TEST_F(CatalogTests, BootstrappingCatalog) {
5252
EXPECT_NE(nullptr, db_metric_table);
5353
}
5454
//
55-
TEST_F(CatalogTests, CreatingDatabase) {
55+
TEST_F(CatalogTests, CreatingDatabaseTest) {
5656
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
5757
auto txn = txn_manager.BeginTransaction();
5858
catalog::Catalog::GetInstance()->CreateDatabase("emp_db", txn);
@@ -62,7 +62,7 @@ TEST_F(CatalogTests, CreatingDatabase) {
6262
txn_manager.CommitTransaction(txn);
6363
}
6464

65-
TEST_F(CatalogTests, CreatingTable) {
65+
TEST_F(CatalogTests, CreatingTableTest) {
6666
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
6767
auto txn = txn_manager.BeginTransaction();
6868
auto id_column = catalog::Column(
@@ -120,7 +120,7 @@ TEST_F(CatalogTests, CreatingTable) {
120120
txn_manager.CommitTransaction(txn);
121121
}
122122

123-
TEST_F(CatalogTests, TableObject) {
123+
TEST_F(CatalogTests, TableObjectTest) {
124124
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
125125
auto txn = txn_manager.BeginTransaction();
126126

@@ -168,7 +168,7 @@ TEST_F(CatalogTests, TableObject) {
168168
txn_manager.CommitTransaction(txn);
169169
}
170170

171-
TEST_F(CatalogTests, TestingNamespace) {
171+
TEST_F(CatalogTests, ingNamespaceTest) {
172172
EXPECT_EQ(ResultType::SUCCESS, TestingSQLUtil::ExecuteSQLQuery("begin;"));
173173
// create namespaces emp_ns0 and emp_ns1
174174
EXPECT_EQ(ResultType::SUCCESS, TestingSQLUtil::ExecuteSQLQuery(
@@ -231,7 +231,7 @@ TEST_F(CatalogTests, TestingNamespace) {
231231
EXPECT_EQ(ResultType::ABORTED, TestingSQLUtil::ExecuteSQLQuery("commit;"));
232232
}
233233

234-
TEST_F(CatalogTests, DroppingTable) {
234+
TEST_F(CatalogTests, DroppingTableTest) {
235235
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
236236
auto txn = txn_manager.BeginTransaction();
237237
auto catalog = catalog::Catalog::GetInstance();
@@ -293,7 +293,7 @@ TEST_F(CatalogTests, DroppingTable) {
293293
txn_manager.CommitTransaction(txn);
294294
}
295295

296-
TEST_F(CatalogTests, DroppingDatabase) {
296+
TEST_F(CatalogTests, DroppingDatabaseTest) {
297297
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
298298
auto txn = txn_manager.BeginTransaction();
299299
catalog::Catalog::GetInstance()->DropDatabaseWithName("emp_db", txn);
@@ -304,7 +304,7 @@ TEST_F(CatalogTests, DroppingDatabase) {
304304
txn_manager.CommitTransaction(txn);
305305
}
306306

307-
TEST_F(CatalogTests, DroppingCatalog) {
307+
TEST_F(CatalogTests, DroppingCatalogTest) {
308308
auto catalog = catalog::Catalog::GetInstance();
309309
EXPECT_NE(nullptr, catalog);
310310
}

‎test/catalog/constraints_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace test {
3838
// Constraints Tests
3939
//===--------------------------------------------------------------------===//
4040

41-
class ConstraintsTests : public PelotonTest {};
41+
class ConstraintsTests : public PelotonTests {};
4242

4343
#ifdef CONSTRAINT_NOTNULL_TEST
4444
TEST_F(ConstraintsTests, NOTNULLTest) {
@@ -112,7 +112,7 @@ TEST_F(ConstraintsTests, NOTNULLTest) {
112112
#endif
113113

114114
#ifdef CONSTRAINT_DEFAULT_TEST
115-
TEST_F(ConstraintsTests, DEFAULTTEST) {
115+
TEST_F(ConstraintsTests, DEFAULTTESTTest) {
116116
// Set all of the columns to be NOT NULL
117117
std::vector<std::vector<catalog::Constraint>> constraints;
118118
for (int i = 0; i < CONSTRAINTS_NUM_COLS; i++) {

‎test/catalog/manager_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace test {
2727
// Manager Tests
2828
//===--------------------------------------------------------------------===//
2929

30-
class ManagerTests : public PelotonTest {};
30+
class ManagerTests : public PelotonTests {};
3131

3232
void AddTileGroup(UNUSED_ATTRIBUTE uint64_t thread_id) {
3333

‎test/catalog/tuple_schema_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace test {
2222
// Tuple Schema Tests
2323
//===--------------------------------------------------------------------===//
2424

25-
class TupleSchemaTests : public PelotonTest {};
25+
class TupleSchemaTests : public PelotonTests {};
2626

2727
TEST_F(TupleSchemaTests, ColumnInfoTest) {
2828
std::vector<catalog::Column> columns;

‎test/codegen/block_nested_loop_join_translator_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace peloton {
2222
namespace test {
2323

24-
class BlockNestedLoopJoinTranslatorTest : public PelotonCodeGenTest {
24+
class BlockNestedLoopJoinTranslatorTests : public PelotonCodeGenTests {
2525
public:
2626
BlockNestedLoopJoinTranslatorTest() : PelotonCodeGenTest() {
2727
// Load the test table
@@ -109,7 +109,7 @@ type::Value BlockNestedLoopJoinTranslatorTest::GetCol(const AbstractTuple &t,
109109
return t.GetValue(static_cast<oid_t>(p));
110110
}
111111

112-
TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoin) {
112+
TEST_F(BlockNestedLoopJoinTranslatorTests, SingleColumnEqualityJoinTest) {
113113
{
114114
LOG_INFO(
115115
"Testing: "
@@ -172,7 +172,7 @@ TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoin) {
172172
}
173173
}
174174

175-
TEST_F(BlockNestedLoopJoinTranslatorTest, NonEqualityJoin) {
175+
TEST_F(BlockNestedLoopJoinTranslatorTests, NonEqualityJoinTest) {
176176
// The left and right input tables have the same schema and data distribution.
177177
// The test table has four columns: A, B, D, E. The values in column B, D, E
178178
// are 1, 2, and 3 more than the values in the A column, respectively. Values

‎test/codegen/bloom_filter_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
namespace peloton {
3737
namespace test {
3838

39-
class BloomFilterCodegenTest : public PelotonTest {
39+
class BloomFilterCodegenTests : public PelotonTests {
4040
public:
4141
BloomFilterCodegenTest() {
4242
// Create test db
@@ -70,7 +70,7 @@ class BloomFilterCodegenTest : public PelotonTest {
7070
const std::string table2_name = "test2";
7171
};
7272

73-
TEST_F(BloomFilterCodegenTest, FalsePositiveRateTest) {
73+
TEST_F(BloomFilterCodegenTests, FalsePositiveRateTest) {
7474
codegen::CodeContext code_context;
7575
codegen::CodeGen codegen(code_context);
7676

@@ -190,7 +190,7 @@ TEST_F(BloomFilterCodegenTest, FalsePositiveRateTest) {
190190

191191
// Testing whether bloom filter can improve the performance of hash join
192192
// when the hash table is bigger than L3 cache and selectivity is low
193-
TEST_F(BloomFilterCodegenTest, PerformanceTest) {
193+
TEST_F(BloomFilterCodegenTests, PerformanceTest) {
194194
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
195195
auto *catalog = catalog::Catalog::GetInstance();
196196
auto *txn = txn_manager.BeginTransaction();

0 commit comments

Comments
 (0)