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

Commit dd5482c

Browse files
schedutronschedutron
committed
Fix naming in test files
1 parent 02e5953 commit dd5482c

Some content is hidden

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

50 files changed

+609
-638
lines changed

‎test/binder/binder_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ using std::make_tuple;
3636
namespace peloton {
3737
namespace test {
3838

39-
class BinderCorrectnessTest : public PelotonTest {
40-
virtual void SetUp() override {
39+
class BinderCorrectnessTestTests : public PelotonTest { virtual void SetUp() override {
4140
PelotonTest::SetUp();
4241
auto catalog = catalog::Catalog::GetInstance();
4342
catalog->Bootstrap();

‎test/catalog/catalog_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace test {
3232

3333
class CatalogTests : public PelotonTest {};
3434

35-
TEST_F(CatalogTests, BootstrappingCatalog) {
35+
TEST_F(CatalogTests, BootstrappingCatalogTest) {
3636
auto catalog = catalog::Catalog::GetInstance();
3737
catalog->Bootstrap();
3838
EXPECT_EQ(1, storage::StorageManager::GetInstance()->GetDatabaseCount());
@@ -48,7 +48,7 @@ TEST_F(CatalogTests, BootstrappingCatalog) {
4848
EXPECT_NE(nullptr, db_metric_table);
4949
}
5050
//
51-
TEST_F(CatalogTests, CreatingDatabase) {
51+
TEST_F(CatalogTests, CreatingDatabaseTest) {
5252
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
5353
auto txn = txn_manager.BeginTransaction();
5454
catalog::Catalog::GetInstance()->CreateDatabase("EMP_DB", txn);
@@ -65,7 +65,7 @@ TEST_F(CatalogTests, CreatingDatabase) {
6565
EXPECT_EQ(0, key_attrs[0]);
6666
}
6767

68-
TEST_F(CatalogTests, CreatingTable) {
68+
TEST_F(CatalogTests, CreatingTableTest) {
6969
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
7070
auto txn = txn_manager.BeginTransaction();
7171
auto id_column = catalog::Column(
@@ -151,7 +151,7 @@ TEST_F(CatalogTests, CreatingTable) {
151151
// 72);
152152
}
153153

154-
TEST_F(CatalogTests, TableObject) {
154+
TEST_F(CatalogTests, TableObjectTest) {
155155
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
156156
auto txn = txn_manager.BeginTransaction();
157157

@@ -185,7 +185,7 @@ TEST_F(CatalogTests, TableObject) {
185185
txn_manager.CommitTransaction(txn);
186186
}
187187

188-
TEST_F(CatalogTests, DroppingTable) {
188+
TEST_F(CatalogTests, DroppingTableTest) {
189189
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
190190
auto txn = txn_manager.BeginTransaction();
191191
auto catalog = catalog::Catalog::GetInstance();
@@ -240,7 +240,7 @@ TEST_F(CatalogTests, DroppingTable) {
240240
txn_manager.CommitTransaction(txn);
241241
}
242242

243-
TEST_F(CatalogTests, DroppingDatabase) {
243+
TEST_F(CatalogTests, DroppingDatabaseTest) {
244244
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
245245
auto txn = txn_manager.BeginTransaction();
246246
catalog::Catalog::GetInstance()->DropDatabaseWithName("EMP_DB", txn);
@@ -251,7 +251,7 @@ TEST_F(CatalogTests, DroppingDatabase) {
251251
txn_manager.CommitTransaction(txn);
252252
}
253253

254-
TEST_F(CatalogTests, DroppingCatalog) {
254+
TEST_F(CatalogTests, DroppingCatalogTest) {
255255
auto catalog = catalog::Catalog::GetInstance();
256256
EXPECT_NE(nullptr, catalog);
257257
}

‎test/catalog/constraints_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ TEST_F(ConstraintsTests, NOTNULLTest) {
113113
#endif
114114

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

‎test/codegen/block_nested_loop_join_translator_test.cpp

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

24-
class BlockNestedLoopJoinTranslatorTest : public PelotonCodeGenTest {
25-
public:
24+
class BlockNestedLoopJoinTranslatorTestTests : public PelotonCodeGenTest { public:
2625
BlockNestedLoopJoinTranslatorTest() : PelotonCodeGenTest() {
2726
// Load the test table
2827
uint32_t num_rows = 10;
@@ -109,7 +108,7 @@ type::Value BlockNestedLoopJoinTranslatorTest::GetCol(const AbstractTuple &t,
109108
return t.GetValue(static_cast<oid_t>(p));
110109
}
111110

112-
TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoin) {
111+
TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoinTest) {
113112
{
114113
LOG_INFO(
115114
"Testing: "
@@ -172,7 +171,7 @@ TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoin) {
172171
}
173172
}
174173

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

‎test/codegen/bloom_filter_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
namespace peloton {
3737
namespace test {
3838

39-
class BloomFilterCodegenTest : public PelotonTest {
40-
public:
39+
class BloomFilterCodegenTestTests : public PelotonTest { public:
4140
BloomFilterCodegenTest() {
4241
// Create test db
4342
auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();

‎test/codegen/case_translator_test.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
namespace peloton {
2626
namespace test {
2727

28-
class CaseTranslatorTest : public PelotonCodeGenTest {
29-
public:
28+
class CaseTranslatorTestTests : public PelotonCodeGenTest { public:
3029
CaseTranslatorTest() : PelotonCodeGenTest(), num_rows_to_insert(64) {
3130
// Load test table
3231
LoadTestTable(TestTableId(), num_rows_to_insert);
@@ -40,7 +39,7 @@ class CaseTranslatorTest : public PelotonCodeGenTest {
4039
uint32_t num_rows_to_insert = 64;
4140
};
4241

43-
TEST_F(CaseTranslatorTest, SimpleCase) {
42+
TEST_F(CaseTranslatorTest, SimpleCaseTest) {
4443
//
4544
// SELECT a, case when a=10 then 1 when else 0 FROM table;
4645
//
@@ -108,7 +107,7 @@ TEST_F(CaseTranslatorTest, SimpleCase) {
108107
}
109108
}
110109

111-
TEST_F(CaseTranslatorTest, SimpleCaseMoreWhen) {
110+
TEST_F(CaseTranslatorTest, SimpleCaseMoreWhenTest) {
112111
//
113112
// SELECT a, case when a=10 then 1 when a=20 then 2 else 0 FROM table;
114113
//

‎test/codegen/delete_translator_test.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
namespace peloton {
2424
namespace test {
2525

26-
class DeleteTranslatorTest : public PelotonCodeGenTest {
27-
public:
26+
class DeleteTranslatorTestTests : public PelotonCodeGenTest { public:
2827
DeleteTranslatorTest() : PelotonCodeGenTest() {}
2928

3029
size_t GetCurrentTableSize(oid_t table_id) {
@@ -47,7 +46,7 @@ class DeleteTranslatorTest : public PelotonCodeGenTest {
4746
uint32_t num_rows_to_insert = 64;
4847
};
4948

50-
TEST_F(DeleteTranslatorTest, DeleteAllTuples) {
49+
TEST_F(DeleteTranslatorTest, DeleteAllTuplesTest) {
5150
//
5251
// DELETE FROM table;
5352
//
@@ -72,7 +71,7 @@ TEST_F(DeleteTranslatorTest, DeleteAllTuples) {
7271
EXPECT_EQ(0, GetCurrentTableSize(TestTableId1()));
7372
}
7473

75-
TEST_F(DeleteTranslatorTest, DeleteWithSimplePredicate) {
74+
TEST_F(DeleteTranslatorTest, DeleteWithSimplePredicateTest) {
7675
//
7776
// DELETE FROM table where a >= 40;
7877
//
@@ -104,7 +103,7 @@ TEST_F(DeleteTranslatorTest, DeleteWithSimplePredicate) {
104103
EXPECT_EQ(4, GetCurrentTableSize(TestTableId2()));
105104
}
106105

107-
TEST_F(DeleteTranslatorTest, DeleteWithCompositePredicate) {
106+
TEST_F(DeleteTranslatorTest, DeleteWithCompositePredicateTest) {
108107
//
109108
// DELETE FROM table where a >= 20 and b = 21;
110109
//
@@ -144,7 +143,7 @@ TEST_F(DeleteTranslatorTest, DeleteWithCompositePredicate) {
144143
EXPECT_EQ(NumRowsInTestTable() - 1, GetCurrentTableSize(TestTableId3()));
145144
}
146145

147-
TEST_F(DeleteTranslatorTest, DeleteWithModuloPredicate) {
146+
TEST_F(DeleteTranslatorTest, DeleteWithModuloPredicateTest) {
148147
//
149148
// DELETE FROM table where a = b % 1;
150149
//

‎test/codegen/function_builder_test.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
namespace peloton {
1919
namespace test {
2020

21-
class FunctionBuilderTest : public PelotonTest {};
22-
23-
TEST_F(FunctionBuilderTest, ConstructSingleFunction) {
21+
class FunctionBuilderTestTests : public PelotonTest {};
22+
TEST_F(FunctionBuilderTest, ConstructSingleFunctionTest) {
2423
// Generate a function like so:
2524
// define @test() {
2625
// ret i32 44;
@@ -42,7 +41,7 @@ TEST_F(FunctionBuilderTest, ConstructSingleFunction) {
4241
ASSERT_EQ(fn(), magic_num);
4342
}
4443

45-
TEST_F(FunctionBuilderTest, ConstructNestedFunction) {
44+
TEST_F(FunctionBuilderTest, ConstructNestedFunctionTest) {
4645
// In this test, we want to construct the following scenario:
4746
// define void @test(i32 %a) {
4847
// %tmp = mul i32 %a, i32 44

‎test/codegen/group_by_translator_test.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
namespace peloton {
2626
namespace test {
2727

28-
class GroupByTranslatorTest : public PelotonCodeGenTest {
29-
public:
28+
class GroupByTranslatorTestTests : public PelotonCodeGenTest { public:
3029
GroupByTranslatorTest() : PelotonCodeGenTest() {
3130
uint32_t num_rows = 10;
3231
LoadTestTable(TestTableId(), num_rows);
@@ -35,7 +34,7 @@ class GroupByTranslatorTest : public PelotonCodeGenTest {
3534
oid_t TestTableId() const { return test_table_oids[0]; }
3635
};
3736

38-
TEST_F(GroupByTranslatorTest, SingleColumnGrouping) {
37+
TEST_F(GroupByTranslatorTest, SingleColumnGroupingTest) {
3938
//
4039
// SELECT a, count(*) FROM table GROUP BY a;
4140
//
@@ -95,7 +94,7 @@ TEST_F(GroupByTranslatorTest, SingleColumnGrouping) {
9594
}
9695
}
9796

98-
TEST_F(GroupByTranslatorTest, MultiColumnGrouping) {
97+
TEST_F(GroupByTranslatorTest, MultiColumnGroupingTest) {
9998
//
10099
// SELECT a, b, count(*) FROM table GROUP BY a, b;
101100
//
@@ -156,7 +155,7 @@ TEST_F(GroupByTranslatorTest, MultiColumnGrouping) {
156155
}
157156
}
158157

159-
TEST_F(GroupByTranslatorTest, AverageAggregation) {
158+
TEST_F(GroupByTranslatorTest, AverageAggregationTest) {
160159
//
161160
// SELECT a, avg(b) FROM table GROUP BY a;
162161
//
@@ -208,7 +207,7 @@ TEST_F(GroupByTranslatorTest, AverageAggregation) {
208207
EXPECT_EQ(10, results.size());
209208
}
210209

211-
TEST_F(GroupByTranslatorTest, AggregationWithOutputPredicate) {
210+
TEST_F(GroupByTranslatorTest, AggregationWithOutputPredicateTest) {
212211
//
213212
// SELECT a, avg(b) as x FROM table GROUP BY a WHERE x > 50;
214213
//
@@ -269,7 +268,7 @@ TEST_F(GroupByTranslatorTest, AggregationWithOutputPredicate) {
269268
EXPECT_EQ(5, results.size());
270269
}
271270

272-
TEST_F(GroupByTranslatorTest, AggregationWithInputPredciate) {
271+
TEST_F(GroupByTranslatorTest, AggregationWithInputPredciateTest) {
273272
//
274273
// SELECT a, avg(b) as x FROM table GROUP BY a WHERE a > 50;
275274
//
@@ -329,7 +328,7 @@ TEST_F(GroupByTranslatorTest, AggregationWithInputPredciate) {
329328
EXPECT_EQ(4, results.size());
330329
}
331330

332-
TEST_F(GroupByTranslatorTest, SingleCountStar) {
331+
TEST_F(GroupByTranslatorTest, SingleCountStarTest) {
333332
//
334333
// SELECT count(*) FROM table;
335334
//
@@ -384,7 +383,7 @@ TEST_F(GroupByTranslatorTest, SingleCountStar) {
384383
CmpBool::CmpTrue);
385384
}
386385

387-
TEST_F(GroupByTranslatorTest, MinAndMax) {
386+
TEST_F(GroupByTranslatorTest, MinAndMaxTest) {
388387
//
389388
// SELECT MAX(a), MIN(b) FROM table;
390389
//

‎test/codegen/hash_join_translator_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
namespace peloton {
2626
namespace test {
2727

28-
class HashJoinTranslatorTest : public PelotonCodeGenTest {
29-
public:
28+
class HashJoinTranslatorTestTests : public PelotonCodeGenTest { public:
3029
HashJoinTranslatorTest() : PelotonCodeGenTest() {
3130
// Load the test table
3231
uint32_t num_rows = 10;

0 commit comments

Comments
 (0)