Merge branch 'master' of https://github.com/SimTk/openmm

serialization/tests/TestSerializeRBTorsionForce.cpp

@@ -6,7 +6,7 @@
  * Biological Structures at Stanford, funded under the NIH Roadmap for        *
  * Medical Research, grant U54 GM072970. See https://simtk.org.               *
  *                                                                            *
- * Portions copyright (c) 2010 Stanford University and the Authors.           *
+ * Portions copyright (c) 2010-2014 Stanford University and the Authors.      *
  * Authors: Peter Eastman                                                     *
  * Contributors:                                                              *
  *                                                                            *
@@ -42,6 +42,7 @@ void testSerialization() {
     // Create a Force.
 
     RBTorsionForce force;
+    force.setForceGroup(3);
     force.addTorsion(0, 1, 2, 3, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6);
     force.addTorsion(0, 2, 3, 4, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7);
     force.addTorsion(2, 3, 4, 7, -1, -2, -3, 1.1, 2.2, 3.3);
@@ -55,6 +56,7 @@ void testSerialization() {
     // Compare the two forces to see if they are identical.
 
     RBTorsionForce& force2 = *copy;
+    ASSERT_EQUAL(force.getForceGroup(), force2.getForceGroup());
     ASSERT_EQUAL(force.getNumTorsions(), force2.getNumTorsions());
     for (int i = 0; i < force.getNumTorsions(); i++) {
         int a1, a2, a3, a4, b1, b2, b3, b4;