Merge branch 'master' into 267-initial-tensor-dimensions-arent-always-accurate

Author: khatchad

com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java

@@ -3843,7 +3843,6 @@ private void test(
                     "Tensor variable for pointer key: " + lpk + " should have types, but was null.",
                     types);
 
-                // check that the type is in the expected set.
                 Set<TensorType> expectedTypes =
                     expectedTensorParameterValueNumberToTypes.get(lpk.getValueNumber());
                 assertNotNull(
@@ -3852,19 +3851,16 @@ private void test(
                         + " should not be null.",
                     expectedTypes);
 
+                // check that the types are the same.
                 assertEquals(
-                    "Expected number of types for value number: "
+                    "Expected types for value number: "
                         + lpk.getValueNumber()
                         + " should be "
-                        + expectedTypes.size()
+                        + expectedTypes
                         + ", but was "
-                        + types.size(),
-                    expectedTypes.size(),
-                    types.size());
-
-                assertTrue(
-                    "Expected types: " + expectedTypes + " to contain actual types: " + types,
-                    expectedTypes.containsAll(types));
+                        + types,
+                    expectedTypes,
+                    types);
               });
     }
   }