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

Commit fd0f23d

Browse files
schedutronschedutron
committed
Fix scattered discrepancies
1 parent 2f28acc commit fd0f23d

31 files changed

+114
-114
lines changed

‎test/binder/binder_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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/catalog/catalog_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ TEST_F(CatalogTests, TableObjectTest) {
167167
txn_manager.CommitTransaction(txn);
168168
}
169169

170-
TEST_F(CatalogTests, TestingNamespace) {
170+
TEST_F(CatalogTests, TestingNamespaceTest) {
171171
EXPECT_EQ(ResultType::SUCCESS, TestingSQLUtil::ExecuteSQLQuery("begin;"));
172172
// create namespaces emp_ns0 and emp_ns1
173173
EXPECT_EQ(ResultType::SUCCESS, TestingSQLUtil::ExecuteSQLQuery(

‎test/codegen/block_nested_loop_join_translator_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ type::Value BlockNestedLoopJoinTranslatorTest::GetCol(const AbstractTuple &t,
107107
return t.GetValue(static_cast<oid_t>(p));
108108
}
109109

110-
TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoinTest) {
110+
TEST_F(BlockNestedLoopJoinTranslatorTests, SingleColumnEqualityJoinTest) {
111111
{
112112
LOG_INFO(
113113
"Testing: "
@@ -170,7 +170,7 @@ TEST_F(BlockNestedLoopJoinTranslatorTest, SingleColumnEqualityJoinTest) {
170170
}
171171
}
172172

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

‎test/codegen/bloom_filter_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class BloomFilterCodegenTests : 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();

‎test/codegen/case_translator_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CaseTranslatorTests : public PelotonCodeGenTest {
4040
uint32_t num_rows_to_insert = 64;
4141
};
4242

43-
TEST_F(CaseTranslatorTest, SimpleCaseTest) {
43+
TEST_F(CaseTranslatorTests, SimpleCaseTest) {
4444
//
4545
// SELECT a, case when a=10 then 1 when else 0 FROM table;
4646
//
@@ -103,7 +103,7 @@ TEST_F(CaseTranslatorTest, SimpleCaseTest) {
103103
}
104104
}
105105

106-
TEST_F(CaseTranslatorTest, SimpleCaseMoreWhenTest) {
106+
TEST_F(CaseTranslatorTests, SimpleCaseMoreWhenTest) {
107107
//
108108
// SELECT a, case when a=10 then 1 when a=20 then 2 else 0 FROM table;
109109
//

‎test/codegen/delete_translator_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DeleteTranslatorTests : public PelotonCodeGenTest {
4747
uint32_t num_rows_to_insert = 64;
4848
};
4949

50-
TEST_F(DeleteTranslatorTest, DeleteAllTuplesTest) {
50+
TEST_F(DeleteTranslatorTests, DeleteAllTuplesTest) {
5151
//
5252
// DELETE FROM table;
5353
//
@@ -72,7 +72,7 @@ TEST_F(DeleteTranslatorTest, DeleteAllTuplesTest) {
7272
EXPECT_EQ(0, GetCurrentTableSize(TestTableId1()));
7373
}
7474

75-
TEST_F(DeleteTranslatorTest, DeleteWithSimplePredicateTest) {
75+
TEST_F(DeleteTranslatorTests, DeleteWithSimplePredicateTest) {
7676
//
7777
// DELETE FROM table where a >= 40;
7878
//
@@ -104,7 +104,7 @@ TEST_F(DeleteTranslatorTest, DeleteWithSimplePredicateTest) {
104104
EXPECT_EQ(4, GetCurrentTableSize(TestTableId2()));
105105
}
106106

107-
TEST_F(DeleteTranslatorTest, DeleteWithCompositePredicateTest) {
107+
TEST_F(DeleteTranslatorTests, DeleteWithCompositePredicateTest) {
108108
//
109109
// DELETE FROM table where a >= 20 and b = 21;
110110
//
@@ -144,7 +144,7 @@ TEST_F(DeleteTranslatorTest, DeleteWithCompositePredicateTest) {
144144
EXPECT_EQ(NumRowsInTestTable() - 1, GetCurrentTableSize(TestTableId3()));
145145
}
146146

147-
TEST_F(DeleteTranslatorTest, DeleteWithModuloPredicateTest) {
147+
TEST_F(DeleteTranslatorTests, DeleteWithModuloPredicateTest) {
148148
//
149149
// DELETE FROM table where a = b % 1;
150150
//

‎test/codegen/function_builder_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace peloton {
1919
namespace test {
2020

2121
class FunctionBuilderTests : public PelotonTest {};
22-
TEST_F(FunctionBuilderTest, ConstructSingleFunctionTest) {
22+
TEST_F(FunctionBuilderTests, ConstructSingleFunctionTest) {
2323
// Generate a function like so:
2424
// define @test() {
2525
// ret i32 44;
@@ -39,7 +39,7 @@ TEST_F(FunctionBuilderTest, ConstructSingleFunctionTest) {
3939
ASSERT_EQ(fn(), magic_num);
4040
}
4141

42-
TEST_F(FunctionBuilderTest, ConstructNestedFunctionTest) {
42+
TEST_F(FunctionBuilderTests, ConstructNestedFunctionTest) {
4343
// In this test, we want to construct the following scenario:
4444
// define void @test(i32 %a) {
4545
// %tmp = mul i32 %a, i32 44

‎test/codegen/group_by_translator_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GroupByTranslatorTests : public PelotonCodeGenTest {
3535
oid_t TestTableId() const { return test_table_oids[0]; }
3636
};
3737

38-
TEST_F(GroupByTranslatorTest, SingleColumnGroupingTest) {
38+
TEST_F(GroupByTranslatorTests, SingleColumnGroupingTest) {
3939
//
4040
// SELECT a, count(*) FROM table GROUP BY a;
4141
//
@@ -94,7 +94,7 @@ TEST_F(GroupByTranslatorTest, SingleColumnGroupingTest) {
9494
}
9595
}
9696

97-
TEST_F(GroupByTranslatorTest, MultiColumnGroupingTest) {
97+
TEST_F(GroupByTranslatorTests, MultiColumnGroupingTest) {
9898
//
9999
// SELECT a, b, count(*) FROM table GROUP BY a, b;
100100
//
@@ -155,7 +155,7 @@ TEST_F(GroupByTranslatorTest, MultiColumnGroupingTest) {
155155
}
156156
}
157157

158-
TEST_F(GroupByTranslatorTest, AverageAggregationTest) {
158+
TEST_F(GroupByTranslatorTests, AverageAggregationTest) {
159159
//
160160
// SELECT a, avg(b) FROM table GROUP BY a;
161161
//
@@ -207,7 +207,7 @@ TEST_F(GroupByTranslatorTest, AverageAggregationTest) {
207207
EXPECT_EQ(10, results.size());
208208
}
209209

210-
TEST_F(GroupByTranslatorTest, AggregationWithOutputPredicateTest) {
210+
TEST_F(GroupByTranslatorTests, AggregationWithOutputPredicateTest) {
211211
//
212212
// SELECT a, avg(b) as x FROM table GROUP BY a WHERE x > 50;
213213
//
@@ -267,7 +267,7 @@ TEST_F(GroupByTranslatorTest, AggregationWithOutputPredicateTest) {
267267
EXPECT_EQ(5, results.size());
268268
}
269269

270-
TEST_F(GroupByTranslatorTest, AggregationWithInputPredciateTest) {
270+
TEST_F(GroupByTranslatorTests, AggregationWithInputPredciateTest) {
271271
//
272272
// SELECT a, avg(b) as x FROM table GROUP BY a WHERE a > 50;
273273
//
@@ -327,7 +327,7 @@ TEST_F(GroupByTranslatorTest, AggregationWithInputPredciateTest) {
327327
EXPECT_EQ(4, results.size());
328328
}
329329

330-
TEST_F(GroupByTranslatorTest, SingleCountStarTest) {
330+
TEST_F(GroupByTranslatorTests, SingleCountStarTest) {
331331
//
332332
// SELECT count(*) FROM table;
333333
//
@@ -381,7 +381,7 @@ TEST_F(GroupByTranslatorTest, SingleCountStarTest) {
381381
type::ValueFactory::GetBigIntValue(10)) == CmpBool::CmpTrue);
382382
}
383383

384-
TEST_F(GroupByTranslatorTest, MinAndMaxTest) {
384+
TEST_F(GroupByTranslatorTests, MinAndMaxTest) {
385385
//
386386
// SELECT MAX(a), MIN(b) FROM table;
387387
//

‎test/codegen/hash_join_translator_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class HashJoinTranslatorTests : public PelotonCodeGenTest {
4747
}
4848
};
4949

50-
TEST_F(HashJoinTranslatorTest, SingleHashJoinColumnTest) {
50+
TEST_F(HashJoinTranslatorTests, SingleHashJoinColumnTest) {
5151
//
5252
// SELECT
5353
// left_table.a, right_table.a, left_table.b, right_table.c,

‎test/codegen/if_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace peloton {
2424
namespace test {
2525

2626
class IfTests : public PelotonTest {};
27-
TEST_F(IfTest, TestIfOnlyTest) {
27+
TEST_F(IfTests, TestIfOnlyTest) {
2828
const std::string func_name = "TestIfOnly";
2929

3030
// Generate a function like so:
@@ -73,7 +73,7 @@ TEST_F(IfTest, TestIfOnlyTest) {
7373
EXPECT_EQ(f(2000), 0);
7474
}
7575

76-
TEST_F(IfTest, TestIfInsideLoopTest) {
76+
TEST_F(IfTests, TestIfInsideLoopTest) {
7777
const std::string func_name = "TestIfInsideLoop";
7878
codegen::CodeContext code_context;
7979
codegen::CodeGen cg{code_context};
@@ -135,7 +135,7 @@ TEST_F(IfTest, TestIfInsideLoopTest) {
135135
ASSERT_EQ(5, f(10));
136136
}
137137

138-
TEST_F(IfTest, BreakTest) {
138+
TEST_F(IfTests, BreakTest) {
139139
const std::string func_name = "TestBreakLoop";
140140
codegen::CodeContext code_context;
141141
codegen::CodeGen cg{code_context};
@@ -184,7 +184,7 @@ TEST_F(IfTest, BreakTest) {
184184
ASSERT_EQ(5, f(7));
185185
}
186186

187-
TEST_F(IfTest, ComplexNestedIfTest) {
187+
TEST_F(IfTests, ComplexNestedIfTest) {
188188
const std::string func_name = "TestIfOnly";
189189

190190
// Generate a function like so:

0 commit comments

Comments
 (0)