update timer and quit tests

Author: mohanchen

source/module_base/test/timer_test.cpp

@@ -43,7 +43,7 @@ class TimerTest : public testing::Test
 	int T_Elapse = 100; // microseconds = 0.1 milliseconds
 	void TearDown()
 	{
-		remove("tmp");
+		//remove("tmp");
 	}
 };
 
@@ -59,19 +59,22 @@ TEST_F(TimerTest, Tick)
 	EXPECT_GT(ModuleBase::timer::timer_pool["wavefunc"]["evc"].cpu_second,0.0001);
 }
 
+
 TEST_F(TimerTest, Start)
 {
 	ModuleBase::timer::start();
 	// start() called tick() once
 	EXPECT_FALSE(ModuleBase::timer::timer_pool[""]["total"].start_flag);
 }
 
+
 TEST_F(TimerTest, write_to_json)
 {
 	ModuleBase::timer::tick("wavefunc","evc");
 	std::this_thread::sleep_for(std::chrono::microseconds(T_Elapse)); // 0.1 ms
 	ModuleBase::timer::tick("wavefunc","evc");
 	ModuleBase::timer::write_to_json("tmp.json");
+
 	// check if tmp.json exists
 	ifs.open("tmp.json");
 	EXPECT_TRUE(ifs.good());
@@ -89,9 +92,6 @@ TEST_F(TimerTest, write_to_json)
 		content += tmp;
 	}
 
-	// check if the content is correct
-	// shuold be like this:
-	// {"total": 0, "sub":[{"class_name": "wavefunc","sub":[{"name":"evc","cpu_second": 0.000318,"calls":2,"cpu_second_per_call":0.000159,"cpu_second_per_total": null}]}]}
 	EXPECT_THAT(content,testing::HasSubstr("\"total\":"));
 	EXPECT_THAT(content,testing::HasSubstr("\"sub\":[{\"class_name\":\"wavefunc\",\"sub\":[{\"name\":\"evc\",\"cpu_second\":"));
 	EXPECT_THAT(content,testing::HasSubstr("\"calls\":2,\"cpu_second_per_call\":"));
@@ -106,25 +106,29 @@ TEST_F(TimerTest, PrintAll)
 	ModuleBase::timer::tick("wavefunc","evc");
 	std::this_thread::sleep_for(std::chrono::microseconds(T_Elapse)); // 0.1 ms
 	ModuleBase::timer::tick("wavefunc","evc");
+
 	// call print_all
 	ofs.open("tmp");
 	testing::internal::CaptureStdout();
 	ModuleBase::timer::print_all(ofs);
 	output = testing::internal::GetCapturedStdout();
 	ofs.close();
+
 	// checout output on screen
-	std::cout << "Get captured stdout: \n" << std::endl;
-	std::cout << output << std::endl;
+	// std::cout << "Get captured stdout: \n" << std::endl;
+	// std::cout << output << std::endl;
 	EXPECT_THAT(output,testing::HasSubstr("TIME STATISTICS"));
 	EXPECT_THAT(output,testing::HasSubstr("CLASS_NAME"));
 	EXPECT_THAT(output,testing::HasSubstr("NAME"));
 	EXPECT_THAT(output,testing::HasSubstr("TIME/s"));
 	EXPECT_THAT(output,testing::HasSubstr("CALLS"));
 	EXPECT_THAT(output,testing::HasSubstr("AVG/s"));
 	EXPECT_THAT(output,testing::HasSubstr("PER/%"));
+
 	// check output in file
 	ifs.open("tmp");
-	std::cout << "Capture contents line by line from output file: \n" << std::endl;
+	// std::cout << "Capture contents line by line from output file: \n" << std::endl;
+	getline(ifs,output);
 	getline(ifs,output);
 	EXPECT_THAT(output,testing::HasSubstr("TIME STATISTICS"));
 	getline(ifs,output);
@@ -139,36 +143,41 @@ TEST_F(TimerTest, PrintAll)
 	remove("time.json");
 }
 
+
 TEST_F(TimerTest, PrintUntilNow)
 {
 	long double time = ModuleBase::timer::print_until_now();
 	EXPECT_TRUE(time>0.0);
 }
 
+
 TEST_F(TimerTest, Finish)
 {
 	ModuleBase::timer::tick("wavefunc","evc");
 	std::this_thread::sleep_for(std::chrono::microseconds(T_Elapse)); // 0.1 ms
 	ModuleBase::timer::tick("wavefunc","evc");
+
 	// call print_all
 	ofs.open("tmp");
 	testing::internal::CaptureStdout();
 	ModuleBase::timer::finish(ofs);
 	output = testing::internal::GetCapturedStdout();
 	ofs.close();
 	// checout output on screen
-	std::cout << "Get captured stdout: \n" << std::endl;
-	std::cout << output << std::endl;
+	//std::cout << "Get captured stdout: \n" << std::endl;
+	//std::cout << output << std::endl;
 	EXPECT_THAT(output,testing::HasSubstr("TIME STATISTICS"));
 	EXPECT_THAT(output,testing::HasSubstr("CLASS_NAME"));
 	EXPECT_THAT(output,testing::HasSubstr("NAME"));
 	EXPECT_THAT(output,testing::HasSubstr("TIME/s"));
 	EXPECT_THAT(output,testing::HasSubstr("CALLS"));
 	EXPECT_THAT(output,testing::HasSubstr("AVG/s"));
 	EXPECT_THAT(output,testing::HasSubstr("PER/%"));
+
 	// check output in file
 	ifs.open("tmp");
-	std::cout << "Capture contents line by line from output file: \n" << std::endl;
+	//std::cout << "Capture contents line by line from output file: \n" << std::endl;
+	getline(ifs,output);
 	getline(ifs,output);
 	EXPECT_THAT(output,testing::HasSubstr("TIME STATISTICS"));
 	getline(ifs,output);
@@ -182,7 +191,6 @@ TEST_F(TimerTest, Finish)
 	ifs.close();
 }
 
-// use __MPI to activate parallel environment
 #ifdef __MPI
 int main(int argc, char **argv)
 {

source/module_base/test/tool_quit_test.cpp

@@ -93,7 +93,7 @@ TEST_F(ToolQuitTest,warningquit)
 	ifs.open("running.log");
 	getline(ifs,output);
 	// test output in running.log file
-	EXPECT_THAT(output,testing::HasSubstr("!!!!!!!"));
+	EXPECT_THAT(output,testing::HasSubstr("-------"));
 	ifs.close();
 }
 
@@ -116,7 +116,7 @@ TEST_F(ToolQuitTest,warningquit_with_ret)
 	ifs.open("running.log");
 	getline(ifs,output);
 	// test output in running.log file
-	EXPECT_THAT(output,testing::HasSubstr("!!!!!!!"));
+	EXPECT_THAT(output,testing::HasSubstr("-------"));
 	ifs.close();
 }
 // use __MPI to activate parallel environment