Test that map equality/inequality code generate correctly

Addresses #44
overturetool · Oct 28, 2016 · 398f7ea · 398f7ea
1 parent aede644
commit 398f7ea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/core/vdm2c/src/test/resources/native/map/ExpressionsMap_Tests.cpp b/core/vdm2c/src/test/resources/native/map/ExpressionsMap_Tests.cpp
@@ -16,11 +16,6 @@ vdmFree(res);\
 vdmFree(c)
 
 
-TEST(ExpressionMap, mapEnum)
-{
-	CHECK(CLASS_ExpressionMap__Z7mapEnumEV);
-}
-
 TEST(ExpressionMap, mapDom)
 {
 	CHECK(CLASS_ExpressionMap__Z6mapDomEV);
@@ -35,3 +30,13 @@ TEST(ExpressionMap, mapAccessSimple)
 {
 	CHECK(CLASS_ExpressionMap__Z15mapAccessSimpleEV);
 }
+
+TEST(ExpressionMap, mapEq)
+{
+	CHECK(CLASS_ExpressionMap__Z5mapEqEV);
+}
+
+TEST(ExpressionMap, mapNeq)
+{
+	CHECK(CLASS_ExpressionMap__Z6mapNeqEV);
+}
diff --git a/core/vdm2c/src/test/resources/vdmrt/expressions/ExpressionMap.vdmrt b/core/vdm2c/src/test/resources/vdmrt/expressions/ExpressionMap.vdmrt
@@ -2,9 +2,6 @@ class ExpressionMap
 
 functions
 
-public mapEnum :  () -> bool
-mapEnum () ==  {1 |-> 2, 3 |-> 4} = {3 |-> 4, 1 |-> 2};
-
 public mapDom :  () -> bool
 mapDom () == dom {1 |-> 2, 3 |-> 4} = {3,1};
 
@@ -18,4 +15,10 @@ let m = {1 |-> 2, 3 |-> 4},
 in
   v = 4;
 
+public mapEq :  () -> bool
+mapEq () ==  {1 |-> 2, 3 |-> 4} = {3 |-> 4, 1 |-> 2};
+
+public mapNeq :  () -> bool
+mapNeq () ==  {1 |-> 2, 3 |-> 4} <> {30 |-> 40, 10 |-> 20};
+
 end ExpressionMap