biod.pnpi.spb.ru / alexxy / gromacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update bundled GoogleTest to current HEAD
[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / tests / pdb2gmx.cpp
diff --git a/src/gromacs/gmxpreprocess/tests/pdb2gmx.cpp b/src/gromacs/gmxpreprocess/tests/pdb2gmx.cpp
index 2351c67956da4f35fd443851b13ab270cb99fccb..3c1438d3a1cdd26986159fef0b26a2a3d430ea52 100644 (file)
--- a/src/gromacs/gmxpreprocess/tests/pdb2gmx.cpp
+++ b/src/gromacs/gmxpreprocess/tests/pdb2gmx.cpp
@@ -179,136 +179,138 @@ std::string namesOfTests(const testing::TestParamInfo<Pdb2gmxTest::ParamType>& i
 // CMakeLists.txt file we split them into separtae test binaries.
 
 #if OPLSAA
-INSTANTIATE_TEST_CASE_P(ForOplsaa,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("oplsaa"),
-                                           ::testing::Values("tip3p", "tip4p", "tip5p"),
-                                           ::testing::Values("none", "h"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("fragment1.pdb",
-                                                             "fragment2.pdb",
-                                                             "fragment3.pdb",
-                                                             "fragment4.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForOplsaa,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("oplsaa"),
+                                            ::testing::Values("tip3p", "tip4p", "tip5p"),
+                                            ::testing::Values("none", "h"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no"),
+                                            ::testing::Values("fragment1.pdb",
+                                                              "fragment2.pdb",
+                                                              "fragment3.pdb",
+                                                              "fragment4.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(false)),
+                         namesOfTests);
 #endif
 
 #if GROMOS
-INSTANTIATE_TEST_CASE_P(ForGromos43a1,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("gromos43a1"),
-                                           ::testing::Values("spc", "spce"),
-                                           ::testing::Values("none", "h"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("fragment1.pdb",
-                                                             "fragment2.pdb",
-                                                             "fragment3.pdb",
-                                                             "fragment4.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForGromos43a1,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("gromos43a1"),
+                                            ::testing::Values("spc", "spce"),
+                                            ::testing::Values("none", "h"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no"),
+                                            ::testing::Values("fragment1.pdb",
+                                                              "fragment2.pdb",
+                                                              "fragment3.pdb",
+                                                              "fragment4.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(false)),
+                         namesOfTests);
 
-INSTANTIATE_TEST_CASE_P(ForGromos53a6,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("gromos53a6"),
-                                           ::testing::Values("spc", "spce"),
-                                           ::testing::Values("none", "h"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("fragment1.pdb",
-                                                             "fragment2.pdb",
-                                                             "fragment3.pdb",
-                                                             "fragment4.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForGromos53a6,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("gromos53a6"),
+                                            ::testing::Values("spc", "spce"),
+                                            ::testing::Values("none", "h"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no"),
+                                            ::testing::Values("fragment1.pdb",
+                                                              "fragment2.pdb",
+                                                              "fragment3.pdb",
+                                                              "fragment4.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(false)),
+                         namesOfTests);
 #endif
 
 #if AMBER
-INSTANTIATE_TEST_CASE_P(ForAmber99sb_ildn,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("amber99sb-ildn"),
-                                           ::testing::Values("tip3p"),
-                                           ::testing::Values("none", "h"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("fragment1.pdb",
-                                                             "fragment2.pdb",
-                                                             "fragment3.pdb",
-                                                             "fragment4.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
-INSTANTIATE_TEST_CASE_P(ForAmber99sb_ildnWithTip4p,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("amber99sb-ildn"),
-                                           ::testing::Values("tip4p"),
-                                           ::testing::Values("none"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("tip4p.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(true)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForAmber99sb_ildn,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("amber99sb-ildn"),
+                                            ::testing::Values("tip3p"),
+                                            ::testing::Values("none", "h"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no"),
+                                            ::testing::Values("fragment1.pdb",
+                                                              "fragment2.pdb",
+                                                              "fragment3.pdb",
+                                                              "fragment4.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(false)),
+                         namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForAmber99sb_ildnWithTip4p,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("amber99sb-ildn"),
+                                            ::testing::Values("tip4p"),
+                                            ::testing::Values("none"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no"),
+                                            ::testing::Values("tip4p.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(true)),
+                         namesOfTests);
 #endif
 
 #if CHARMM
-INSTANTIATE_TEST_CASE_P(ForCharmm27,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("charmm27"),
-                                           ::testing::Values("tip3p"),
-                                           ::testing::Values("none", "h"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("fragment1.pdb",
-                                                             "fragment2.pdb",
-                                                             "fragment3.pdb",
-                                                             "fragment4.pdb",
-                                                             "single-residue.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForCharmm27,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("charmm27"),
+                                            ::testing::Values("tip3p"),
+                                            ::testing::Values("none", "h"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no"),
+                                            ::testing::Values("fragment1.pdb",
+                                                              "fragment2.pdb",
+                                                              "fragment3.pdb",
+                                                              "fragment4.pdb",
+                                                              "single-residue.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(false)),
+                         namesOfTests);
 
 
-INSTANTIATE_TEST_CASE_P(ChainSep,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("charmm27"),
-                                           ::testing::Values("tip3p"),
-                                           ::testing::Values("none"),
-                                           ::testing::Values("id", "ter", "id_or_ter", "id_and_ter"),
-                                           ::testing::Values("all", "no"),
-                                           ::testing::Values("chainTer.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(
+        ChainSep,
+        Pdb2gmxTest,
+        ::testing::Combine(::testing::Values("charmm27"),
+                           ::testing::Values("tip3p"),
+                           ::testing::Values("none"),
+                           ::testing::Values("id", "ter", "id_or_ter", "id_and_ter"),
+                           ::testing::Values("all", "no"),
+                           ::testing::Values("chainTer.pdb"),
+                           ::testing::Values(efGRO),
+                           ::testing::Values(false)),
+        namesOfTests);
 
-INSTANTIATE_TEST_CASE_P(ChainChanges,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("charmm27"),
-                                           ::testing::Values("tip3p"),
-                                           ::testing::Values("none"),
-                                           ::testing::Values("id", "ter", "id_or_ter", "id_and_ter"),
-                                           ::testing::Values("no"),
-                                           ::testing::Values("two-fragments.pdb"),
-                                           ::testing::Values(efPDB),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(
+        ChainChanges,
+        Pdb2gmxTest,
+        ::testing::Combine(::testing::Values("charmm27"),
+                           ::testing::Values("tip3p"),
+                           ::testing::Values("none"),
+                           ::testing::Values("id", "ter", "id_or_ter", "id_and_ter"),
+                           ::testing::Values("no"),
+                           ::testing::Values("two-fragments.pdb"),
+                           ::testing::Values(efPDB),
+                           ::testing::Values(false)),
+        namesOfTests);
 
-INSTANTIATE_TEST_CASE_P(ForCharmm27CyclicSystem,
-                        Pdb2gmxTest,
-                        ::testing::Combine(::testing::Values("charmm27"),
-                                           ::testing::Values("tip3p"),
-                                           ::testing::Values("none"),
-                                           ::testing::Values("id_or_ter"),
-                                           ::testing::Values("no", "all"),
-                                           ::testing::Values("cyclic-rna.pdb",
-                                                             "cyclic-protein-small.pdb"),
-                                           ::testing::Values(efGRO),
-                                           ::testing::Values(false)),
-                        namesOfTests);
+INSTANTIATE_TEST_SUITE_P(ForCharmm27CyclicSystem,
+                         Pdb2gmxTest,
+                         ::testing::Combine(::testing::Values("charmm27"),
+                                            ::testing::Values("tip3p"),
+                                            ::testing::Values("none"),
+                                            ::testing::Values("id_or_ter"),
+                                            ::testing::Values("no", "all"),
+                                            ::testing::Values("cyclic-rna.pdb",
+                                                              "cyclic-protein-small.pdb"),
+                                            ::testing::Values(efGRO),
+                                            ::testing::Values(false)),
+                         namesOfTests);
 #endif
 
 } // namespace
Local GROMACS mirror with custom stuff