Skip to content

Commit ff824b8

Browse files
committed
modify the test name following "case upper camel case naming"
delete the redundant comment lines.
1 parent 7680e5e commit ff824b8

File tree

1 file changed

+21
-25
lines changed

1 file changed

+21
-25
lines changed

source/module_base/test/matrix_test.cpp

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,15 @@ class matrixTest : public testing::Test
5959

6060
};
6161

62-
TEST(matrix,Constructornrnc)
62+
TEST(matrix,ConstructorNrNc)
6363
{
6464
ModuleBase::matrix m(3,4,true);
6565
EXPECT_EQ(m.nr,3);
6666
EXPECT_EQ(m.nc,4);
67-
EXPECT_DOUBLE_EQ(m(0,0),0.0);
68-
//EXPECT_DEATH(ModuleBase::matrix m(0,1),"");
69-
//EXPECT_DEATH(ModuleBase::matrix m(1,0),"");
70-
//EXPECT_DEATH(ModuleBase::matrix m(-1,1),"");
71-
//EXPECT_DEATH(ModuleBase::matrix m(1,-1),"");
67+
EXPECT_DOUBLE_EQ(m(0,0),0.0);
7268
}
7369

74-
TEST_F(matrixTest,constructorMatrix)
70+
TEST_F(matrixTest,ConstructorMatrix)
7571
{
7672
ModuleBase::matrix m(m33a);
7773
int mnr = m.nr;
@@ -83,7 +79,7 @@ TEST_F(matrixTest,constructorMatrix)
8379
}
8480
}
8581

86-
TEST_F(matrixTest,constructorMtrixRvalue)
82+
TEST_F(matrixTest,ConstructorMtrixRValue)
8783
{
8884

8985
ModuleBase::matrix m(3.0*m33a);
@@ -95,7 +91,7 @@ TEST_F(matrixTest,constructorMtrixRvalue)
9591
}
9692
}
9793

98-
TEST_F(matrixTest,create)
94+
TEST_F(matrixTest,Create)
9995
{
10096
m33a.create(13,14,true);
10197
EXPECT_EQ(m33a.nr,13);
@@ -106,7 +102,7 @@ TEST_F(matrixTest,create)
106102
}
107103
}
108104

109-
TEST_F(matrixTest,operatorEqualMatrix)
105+
TEST_F(matrixTest,OperatorEqualMatrix)
110106
{
111107
ModuleBase::matrix m;
112108
m = m33a;
@@ -122,7 +118,7 @@ TEST_F(matrixTest,operatorEqualMatrix)
122118
EXPECT_EQ(m23a.nc,m33a.nc);
123119
}
124120

125-
TEST_F(matrixTest,operatorEqualMatrixRvalue)
121+
TEST_F(matrixTest,OperatorEqualMatrixRvalue)
126122
{
127123
ModuleBase::matrix m;
128124
m = 3.0 * m33a;
@@ -134,15 +130,15 @@ TEST_F(matrixTest,operatorEqualMatrixRvalue)
134130
}
135131
}
136132

137-
TEST_F(matrixTest,operatorParentheses)
133+
TEST_F(matrixTest,OperatorParentheses)
138134
{
139135
//EXPECT_DEATH(m33a(3,3),"");
140136
//EXPECT_DEATH(m33a(-1,0),"");
141137
m33a(0,0) = 1.1;
142138
EXPECT_DOUBLE_EQ(m33a(0,0),1.1);
143139
}
144140

145-
TEST_F(matrixTest,operatorMultiplyEqual)
141+
TEST_F(matrixTest,OperatorMultiplyEqual)
146142
{
147143
m33b = m33a;
148144
m33a *= 11.1;
@@ -155,7 +151,7 @@ TEST_F(matrixTest,operatorMultiplyEqual)
155151
}
156152
}
157153

158-
TEST_F(matrixTest,operatorPlusEqual)
154+
TEST_F(matrixTest,OperatorPlusEqual)
159155
{
160156
EXPECT_DEATH(m33a += m34a,"");
161157

@@ -170,7 +166,7 @@ TEST_F(matrixTest,operatorPlusEqual)
170166
}
171167
}
172168

173-
TEST_F(matrixTest,operatorMinusEqual)
169+
TEST_F(matrixTest,OperatorMinusEqual)
174170
{
175171
EXPECT_DEATH(m33a -= m34a,"");
176172

@@ -185,15 +181,15 @@ TEST_F(matrixTest,operatorMinusEqual)
185181
}
186182
}
187183

188-
TEST_F(matrixTest,classMatrixTraceOn)
184+
TEST_F(matrixTest,ClassMatrixTraceOn)
189185
{
190186
m33a(0,0) = 1.1;
191187
m33a(1,1) = 2.2;
192188
m33a(2,2) = 5.5;
193189
EXPECT_DOUBLE_EQ(m33a.trace_on(),8.8);
194190
}
195191

196-
TEST_F(matrixTest,classMatrixZeroOut)
192+
TEST_F(matrixTest,ClassMatrixZeroOut)
197193
{
198194
m33a.zero_out();
199195
for (int i=0;i<m33a.nr;++i)
@@ -205,7 +201,7 @@ TEST_F(matrixTest,classMatrixZeroOut)
205201
}
206202
}
207203

208-
TEST_F(matrixTest,classMatrixMaxMinAbsmax)
204+
TEST_F(matrixTest,ClassMatrixMaxMinAbsmax)
209205
{
210206
m33a(1,0) = 9999.9;
211207
m33a(0,0) = -999999.9;
@@ -214,13 +210,13 @@ TEST_F(matrixTest,classMatrixMaxMinAbsmax)
214210
EXPECT_DOUBLE_EQ(m33a.absmax(),999999.9);
215211
}
216212

217-
TEST_F(matrixTest,classMatrixNorm)
213+
TEST_F(matrixTest,ClassMatrixNorm)
218214
{
219215
EXPECT_NEAR(m33a.norm(),16.881943016134133728,1E-12);
220216
EXPECT_NEAR(m33b.norm(),187.38956747908889611,1E-12);
221217
}
222218

223-
TEST_F(matrixTest,operatorPlus)
219+
TEST_F(matrixTest,OperatorPlus)
224220
{
225221
m33c = m33a + m33b;
226222
for (int i=0;i<m33a.nr;++i)
@@ -235,7 +231,7 @@ TEST_F(matrixTest,operatorPlus)
235231
}
236232

237233

238-
TEST_F(matrixTest,operatorMinus)
234+
TEST_F(matrixTest,OperatorMinus)
239235
{
240236
m33c = m33a - m33b;
241237
for (int i=0;i<m33a.nr;++i)
@@ -248,7 +244,7 @@ TEST_F(matrixTest,operatorMinus)
248244
EXPECT_DEATH(m33a-m34a,"");
249245
}
250246

251-
TEST_F(matrixTest,operatorMultiplyTwoMatrix)
247+
TEST_F(matrixTest,OperatorMultiplyTwoMatrix)
252248
{
253249
EXPECT_DEATH(m34a*m33a,"");
254250

@@ -283,7 +279,7 @@ TEST_F(matrixTest,operatorMultiplyTwoMatrix)
283279
EXPECT_DOUBLE_EQ(m33c(2,2),-138.0);
284280
}
285281

286-
TEST_F(matrixTest,operatorMultiplyDouble)
282+
TEST_F(matrixTest,OperatorMultiplyDouble)
287283
{
288284
m33b = 3.0 * m33a;
289285
m33c = m33a * 3.0;
@@ -294,7 +290,7 @@ TEST_F(matrixTest,operatorMultiplyDouble)
294290
}
295291
}
296292

297-
TEST_F(matrixTest,transpose)
293+
TEST_F(matrixTest,Transpose)
298294
{
299295
m23a(0,0) = 1.0; m23a(0,1) = 2.0; m23a(0,2) = 3.0;
300296
m23a(1,0) = 4.0; m23a(1,1) = 5.0; m23a(1,2) = 6.0;
@@ -325,7 +321,7 @@ TEST_F(matrixTest,TraceOn)
325321
EXPECT_DOUBLE_EQ(trace_on(m32,m23),967.0);
326322
}
327323

328-
TEST_F(matrixTest,mdot)
324+
TEST_F(matrixTest,MDot)
329325
{
330326
EXPECT_DEATH(mdot(m23a,m33a),"");
331327
EXPECT_DEATH(mdot(m34a,m33a),"");

0 commit comments

Comments
 (0)