Skip to content

Commit 58f40b1

Browse files
author
abacus_fixer
committed
update mulliken test to match new output format
1 parent 40b6fa5 commit 58f40b1

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

source/source_io/test/output_mulliken_test.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ TYPED_TEST(OutputMullikenTest, nspin1)
4949
EXPECT_NEAR(tot_chg[0], 4.0, 1e-5);
5050
std::ifstream ifs("./mulliken.txt");
5151
std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
52-
EXPECT_THAT(str, testing::HasSubstr("Total charge:\t4"));
53-
EXPECT_THAT(str, testing::HasSubstr("Total Charge on atom: Si 4.0000"));
52+
EXPECT_THAT(str, testing::HasSubstr(" Total charge 4"));
53+
EXPECT_THAT(str, testing::HasSubstr(" total charge on atom 1 4.0000"));
5454
remove("./mulliken.txt");
5555
}
5656

@@ -69,11 +69,11 @@ TYPED_TEST(OutputMullikenTest, nspin2)
6969
EXPECT_NEAR(tot_chg[1], 1.0, 1e-5);
7070
std::ifstream ifs("./mulliken.txt");
7171
std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
72-
EXPECT_THAT(str, testing::HasSubstr("Total charge:\t4"));
73-
EXPECT_THAT(str, testing::HasSubstr("Total charge of spin 1:\t3"));
74-
EXPECT_THAT(str, testing::HasSubstr("Total charge of spin 2:\t1"));
75-
EXPECT_THAT(str, testing::HasSubstr("Total Charge on atom: Si 4.0000"));
76-
EXPECT_THAT(str, testing::HasSubstr("Total Magnetism on atom: Si 2.0000"));
72+
EXPECT_THAT(str, testing::HasSubstr(" Total charge 4"));
73+
EXPECT_THAT(str, testing::HasSubstr(" Total charge of spin1 3"));
74+
EXPECT_THAT(str, testing::HasSubstr(" Total charge of spin2 1"));
75+
EXPECT_THAT(str, testing::HasSubstr(" total charge on atom 1 4.0000"));
76+
EXPECT_THAT(str, testing::HasSubstr(" total magnetism on atom 1 2.0000"));
7777
remove("./mulliken.txt");
7878
}
7979

@@ -95,12 +95,12 @@ TYPED_TEST(OutputMullikenTest, nspin4)
9595
EXPECT_NEAR(tot_chg[3], 2.0, 1e-5);
9696
std::ifstream ifs("./mulliken.txt");
9797
std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
98-
EXPECT_THAT(str, testing::HasSubstr("Total charge:\t4"));
99-
EXPECT_THAT(str, testing::HasSubstr("Total Charge on atom: Si 4.0000"));
98+
EXPECT_THAT(str, testing::HasSubstr(" Total charge 4"));
99+
EXPECT_THAT(str, testing::HasSubstr(" total charge on atom 1 4.0000"));
100100
EXPECT_THAT(
101101
str,
102102
testing::HasSubstr(
103-
"Total Magnetism on atom: Si 0.0000 0.0000 2.0000"));
103+
" total magnetism on atom 1 0.0000 0.0000 2.0000"));
104104
remove("./mulliken.txt");
105105
}
106106

0 commit comments

Comments
 (0)