Skip to content

Commit 155a128

Browse files
lanshuyuelanshuyue
committed
ModuleMD Unittests modify
1 parent 324fd59 commit 155a128

File tree

6 files changed

+91
-12
lines changed

6 files changed

+91
-12
lines changed

‎source/source_md/test/fire_test.cpp‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,19 @@ TEST_F(FIREtest, PrintMD)
184184
std::ifstream ifs("running_fire.log");
185185
std::string output_str;
186186

187+
// Line 6
188+
getline(ifs, output_str);
189+
EXPECT_THAT(output_str, testing::HasSubstr(" ELECTRONIC PART OF STRESS: 0.2461 kbar"));
190+
191+
// Line 7
192+
getline(ifs, output_str);
193+
EXPECT_THAT(output_str, testing::HasSubstr(" IONIC (KINETIC) PART OF STRESS: 0.838539 kbar"));
194+
195+
// Line 5
196+
getline(ifs, output_str);
197+
EXPECT_THAT(output_str, testing::HasSubstr(" MD PRESSURE (ELECTRONS+IONS) : 1.08464 kbar"));
198+
199+
getline(ifs, output_str);
187200
// Line 1
188201
getline(ifs, output_str);
189202
EXPECT_THAT(output_str,
@@ -209,17 +222,7 @@ TEST_F(FIREtest, PrintMD)
209222
testing::HasSubstr(
210223
" ------------------------------------------------------------------------------------------------"));
211224

212-
// Line 5
213-
getline(ifs, output_str);
214-
EXPECT_THAT(output_str, testing::HasSubstr(" MD PRESSURE (ELECTRONS+IONS) : 1.0846391 kbar"));
215-
216-
// Line 6
217-
getline(ifs, output_str);
218-
EXPECT_THAT(output_str, testing::HasSubstr(" ELECTRONIC PART OF STRESS: 0.24609992 kbar"));
219-
220-
// Line 7
221225
getline(ifs, output_str);
222-
EXPECT_THAT(output_str, testing::HasSubstr(" IONIC (KINETIC) PART OF STRESS: 0.83853919 kbar"));
223226

224227
// Line 8
225228
getline(ifs, output_str);

‎source/source_md/test/langevin_test.cpp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,25 @@ TEST_F(Langevin_test, print_md)
170170
std::ifstream ifs("running_langevin.log");
171171
std::string output_str;
172172
getline(ifs, output_str);
173+
EXPECT_THAT(
174+
output_str,
175+
testing::HasSubstr(
176+
" ELECTRONIC PART OF STRESS: 0.2461 kbar"
177+
));
178+
getline(ifs, output_str);
179+
EXPECT_THAT(
180+
output_str,
181+
testing::HasSubstr(
182+
" IONIC (KINETIC) PART OF STRESS: 0.838539 kbar"
183+
));
184+
getline(ifs, output_str);
185+
EXPECT_THAT(
186+
output_str,
187+
testing::HasSubstr(
188+
" MD PRESSURE (ELECTRONS+IONS) : 1.08464 kbar"
189+
));
190+
getline(ifs, output_str);
191+
getline(ifs, output_str);
173192
EXPECT_THAT(
174193
output_str,
175194
testing::HasSubstr(

‎source/source_md/test/md_func_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,11 +385,11 @@ TEST_F(MD_func_test, print_stress)
385385
std::ifstream ifs("running.log");
386386
std::string output_str;
387387
getline(ifs, output_str);
388-
EXPECT_THAT(output_str, testing::HasSubstr("MD PRESSURE (ELECTRONS+IONS) : 0 kbar"));
389-
getline(ifs, output_str);
390388
EXPECT_THAT(output_str, testing::HasSubstr("ELECTRONIC PART OF STRESS: 0 kbar"));
391389
getline(ifs, output_str);
392390
EXPECT_THAT(output_str, testing::HasSubstr("IONIC (KINETIC) PART OF STRESS: 0 kbar"));
391+
getline(ifs, output_str);
392+
EXPECT_THAT(output_str, testing::HasSubstr("MD PRESSURE (ELECTRONS+IONS) : 0 kbar"));
393393
/*
394394
getline(ifs, output_str);
395395
getline(ifs, output_str);

‎source/source_md/test/msst_test.cpp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,25 @@ TEST_F(MSST_test, print_md)
226226
std::ifstream ifs("running_msst.log");
227227
std::string output_str;
228228
getline(ifs, output_str);
229+
EXPECT_THAT(
230+
output_str,
231+
testing::HasSubstr(
232+
" ELECTRONIC PART OF STRESS: 0.2461 kbar"
233+
));
234+
getline(ifs, output_str);
235+
EXPECT_THAT(
236+
output_str,
237+
testing::HasSubstr(
238+
" IONIC (KINETIC) PART OF STRESS: 0.830154 kbar"
239+
));
240+
getline(ifs, output_str);
241+
EXPECT_THAT(
242+
output_str,
243+
testing::HasSubstr(
244+
" MD PRESSURE (ELECTRONS+IONS) : 1.07625 kbar"
245+
));
246+
getline(ifs, output_str);
247+
getline(ifs, output_str);
229248
EXPECT_THAT(
230249
output_str,
231250
testing::HasSubstr(

‎source/source_md/test/nhchain_test.cpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,22 @@ TEST_F(NHC_test, print_md)
216216
std::ifstream ifs("running_nhchain.log");
217217
std::string output_str;
218218
getline(ifs, output_str);
219+
EXPECT_THAT(
220+
output_str,
221+
testing::HasSubstr(
222+
" ELECTRONIC PART OF STRESS: 0.2461 kbar"));
223+
getline(ifs, output_str);
224+
EXPECT_THAT(
225+
output_str,
226+
testing::HasSubstr(
227+
" IONIC (KINETIC) PART OF STRESS: 0.838539 kbar"));
228+
getline(ifs, output_str);
229+
EXPECT_THAT(
230+
output_str,
231+
testing::HasSubstr(
232+
" MD PRESSURE (ELECTRONS+IONS) : 1.08464 kbar"));
233+
getline(ifs, output_str);
234+
getline(ifs, output_str);
219235
EXPECT_THAT(
220236
output_str,
221237
testing::HasSubstr(

‎source/source_md/test/verlet_test.cpp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,28 @@ TEST_F(Verlet_test, print_md)
311311
std::ifstream ifs("running_verlet.log");
312312
std::string output_str;
313313
getline(ifs, output_str);
314+
EXPECT_THAT(
315+
output_str,
316+
testing::HasSubstr(
317+
" ELECTRONIC PART OF STRESS: 0.2461 kbar"
318+
)
319+
);
320+
getline(ifs, output_str);
321+
EXPECT_THAT(
322+
output_str,
323+
testing::HasSubstr(
324+
" IONIC (KINETIC) PART OF STRESS: 0.838539 kbar"
325+
)
326+
);
327+
getline(ifs, output_str);
328+
EXPECT_THAT(
329+
output_str,
330+
testing::HasSubstr(
331+
" MD PRESSURE (ELECTRONS+IONS) : 1.08464 kbar"
332+
)
333+
);
334+
getline(ifs, output_str);
335+
getline(ifs, output_str);
314336
EXPECT_THAT(
315337
output_str,
316338
testing::HasSubstr(

0 commit comments

Comments
 (0)