Commit bab97655 authored by Peter Eastman's avatar Peter Eastman
Browse files

AMOEBA serialization test cases were failing because they didn't load the plugin

parent b8cba79f
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaAngleForce.h" #include "openmm/AmoebaAngleForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -79,6 +80,7 @@ void testSerialization() { ...@@ -79,6 +80,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaBondForce.h" #include "openmm/AmoebaBondForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -74,6 +75,7 @@ void testSerialization() { ...@@ -74,6 +75,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaGeneralizedKirkwoodForce.h" #include "openmm/AmoebaGeneralizedKirkwoodForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -93,6 +94,7 @@ void testSerialization() { ...@@ -93,6 +94,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaInPlaneAngleForce.h" #include "openmm/AmoebaInPlaneAngleForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -84,6 +85,7 @@ void testSerialization() { ...@@ -84,6 +85,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaMultipoleForce.h" #include "openmm/AmoebaMultipoleForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -185,6 +186,7 @@ void testSerialization() { ...@@ -185,6 +186,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaOutOfPlaneBendForce.h" #include "openmm/AmoebaOutOfPlaneBendForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -83,6 +84,7 @@ void testSerialization() { ...@@ -83,6 +84,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaPiTorsionForce.h" #include "openmm/AmoebaPiTorsionForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -73,6 +74,7 @@ void testSerialization() { ...@@ -73,6 +74,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaStretchBendForce.h" #include "openmm/AmoebaStretchBendForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -78,6 +79,7 @@ void testSerialization() { ...@@ -78,6 +79,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaTorsionTorsionForce.h" #include "openmm/AmoebaTorsionTorsionForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -132,6 +133,7 @@ void testSerialization() { ...@@ -132,6 +133,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaVdwForce.h" #include "openmm/AmoebaVdwForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -119,6 +120,7 @@ void testSerialization() { ...@@ -119,6 +120,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "openmm/Platform.h"
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/AmoebaWcaDispersionForce.h" #include "openmm/AmoebaWcaDispersionForce.h"
#include "openmm/serialization/XmlSerializer.h" #include "openmm/serialization/XmlSerializer.h"
...@@ -98,6 +99,7 @@ void testSerialization() { ...@@ -98,6 +99,7 @@ void testSerialization() {
int main() { int main() {
try { try {
Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment