fresh unit test according to refactor

Author: goodchong

source/module_cell/module_neighbor/test/sltk_atom_arrange_test.cpp

@@ -88,11 +88,11 @@ TEST_F(SltkAtomArrangeTest, setsrNL)
     std::ofstream ofs;
     ofs.open("./to_test_arrange.txt");
     test_sr = test.set_sr_NL(ofs, teststring, rcutmax_Phi, rcutmax_Beta, gamma_only_local);
-    EXPECT_DOUBLE_EQ(test_sr, 2.01);
+    EXPECT_DOUBLE_EQ(test_sr, 2.001);
 
     gamma_only_local = false;
     test_sr = test.set_sr_NL(ofs, teststring, rcutmax_Phi, rcutmax_Beta, gamma_only_local);
-    EXPECT_DOUBLE_EQ(test_sr, 6.01);
+    EXPECT_DOUBLE_EQ(test_sr, 6.001);
 
     const std::string teststring2 = "no";
     test_sr = test.set_sr_NL(ofs, teststring2, rcutmax_Phi, rcutmax_Beta, gamma_only_local);

source/module_cell/module_neighbor/test/sltk_atom_input_test.cpp

@@ -107,16 +107,10 @@ TEST_F(SltkAtomInputTest, Constructor)
     ofs.close();
     ifs.open("test.out");
     std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
-    EXPECT_THAT(str, testing::HasSubstr("ntype = 1"));
-    EXPECT_THAT(str, testing::HasSubstr("Amount(atom number) = 2"));
     EXPECT_THAT(str, testing::HasSubstr("Periodic_boundary = 1"));
     EXPECT_THAT(str, testing::HasSubstr("Searching radius(lat0) = 2.55"));
-    // EXPECT_THAT(str, testing::HasSubstr("CellLength(unit: lat0) = [ 0.707107, 0.707107, 0.707107 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("min_tau = [ -0.75, 0, 0 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("max_tau = [ 0, 0.75, 0.75 ]"));
     EXPECT_THAT(str, testing::HasSubstr("glayer+ = [ 6, 6, 6 ]"));
     EXPECT_THAT(str, testing::HasSubstr("glayer- = [ 5, 5, 5 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("CellDim = [ 11, 11, 11 ]"));
     ifs.close();
     remove("test.out");
 }
@@ -138,6 +132,7 @@ TEST_F(SltkAtomInputTest, Getters)
     ofs.close();
     remove("test.out");
 }
+/* 
 
 TEST_F(SltkAtomInputDeathTest, ConstructorWarning1)
 {
@@ -154,7 +149,6 @@ TEST_F(SltkAtomInputDeathTest, ConstructorWarning1)
     ofs.close();
     remove("test.out");
 }
-/* 
 TEST_F(SltkAtomInputDeathTest, ConstructorWarning2)
 {
     ofs.open("test.out");
@@ -216,14 +210,9 @@ TEST_F(SltkAtomInputTest, ConstructorNoExpand)
     ofs.close();
     ifs.open("test.out");
     std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
-    EXPECT_THAT(str, testing::HasSubstr("ntype = 1"));
-    EXPECT_THAT(str, testing::HasSubstr("Amount(atom number) = 2"));
     EXPECT_THAT(str, testing::HasSubstr("Periodic_boundary = 1"));
     EXPECT_THAT(str, testing::HasSubstr("Searching radius(lat0) = 0"));
-    // EXPECT_THAT(str, testing::HasSubstr("CellLength(unit: lat0) = [ 0.707107, 0.707107, 0.707107 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("min_tau = [ -0.75, 0, 0 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("max_tau = [ 0, 0.75, 0.75 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("glayer+ = [ 2, 2, 2 ]"));
+    EXPECT_THAT(str, testing::HasSubstr("glayer+ = [ 1, 1, 1 ]"));
     EXPECT_THAT(str, testing::HasSubstr("glayer- = [ 0, 0, 0 ]"));
     ifs.close();
     remove("test.out");
@@ -240,16 +229,10 @@ TEST_F(SltkAtomInputTest, ConstructorSmallSearchRadius)
     ofs.close();
     ifs.open("test.out");
     std::string str((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
-    EXPECT_THAT(str, testing::HasSubstr("ntype = 1"));
-    EXPECT_THAT(str, testing::HasSubstr("Amount(atom number) = 2"));
     EXPECT_THAT(str, testing::HasSubstr("Periodic_boundary = 1"));
     EXPECT_THAT(str, testing::HasSubstr("Searching radius(lat0) = 0.5"));
-    // EXPECT_THAT(str, testing::HasSubstr("CellLength(unit: lat0) = [ 0.707107, 0.707107, 0.707107 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("min_tau = [ -0.75, 0, 0 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("max_tau = [ 0, 0.75, 0.75 ]"));
     EXPECT_THAT(str, testing::HasSubstr("glayer+ = [ 2, 2, 2 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("glayer- = [ 2, 2, 2 ]"));
-    EXPECT_THAT(str, testing::HasSubstr("CellDim = [ 4, 4, 4 ]"));
+    EXPECT_THAT(str, testing::HasSubstr("glayer- = [ 1, 1, 1 ]"));
     ifs.close();
     remove("test.out");
 }

source/module_cell/module_neighbor/test/sltk_grid_test.cpp

@@ -112,13 +112,13 @@ TEST_F(SltkGridTest, InitSmall)
     EXPECT_DOUBLE_EQ(LatGrid.sradius, 0.5);
 
     // minimal value of x, y, z
-    EXPECT_DOUBLE_EQ(LatGrid.true_cell_x, 2);
-    EXPECT_DOUBLE_EQ(LatGrid.true_cell_y, 2);
-    EXPECT_DOUBLE_EQ(LatGrid.true_cell_z, 2);
+    EXPECT_DOUBLE_EQ(LatGrid.true_cell_x, 1);
+    EXPECT_DOUBLE_EQ(LatGrid.true_cell_y, 1);
+    EXPECT_DOUBLE_EQ(LatGrid.true_cell_z, 1);
     // number of cells in x, y, z
-    EXPECT_EQ(LatGrid.cell_nx, 4);
-    EXPECT_EQ(LatGrid.cell_ny, 4);
-    EXPECT_EQ(LatGrid.cell_nz, 4);
+    EXPECT_EQ(LatGrid.cell_nx, 3);
+    EXPECT_EQ(LatGrid.cell_ny, 3);
+    EXPECT_EQ(LatGrid.cell_nz, 3);
     ofs.close();
     remove("test.out");
 }