Fixed JavaSymbolicObjectTest after changes to KItem (runtimeverification#201). (runtimeverification#203)

denis-bogdanas · web-flow · commit 799756eb40a4 · 2018-11-26T16:20:50.000+02:00
diff --git a/java-backend/src/test/java/org/kframework/backend/java/kil/JavaSymbolicObjectTest.java b/java-backend/src/test/java/org/kframework/backend/java/kil/JavaSymbolicObjectTest.java
@@ -17,6 +17,8 @@
 
 public class JavaSymbolicObjectTest extends BaseTestCase {
 
+    @Mock
+    GlobalContext globalContext;
     @Mock
     Definition definition;
 
@@ -37,22 +39,22 @@ public void testVariableSet() {
         assertEquals(Collections.singleton(v1), v1.variableSet());
         assertEquals(Collections.singleton(v1), v1.variableSet);
 
-        KItem k1 = new KItem(KLabelConstant.of(foo, definition), KList.EMPTY, null, Sort.of(KORE.Sort("bar@FOO")), true);
+        KItem k1 = new KItem(KLabelConstant.of(foo, definition), KList.EMPTY, globalContext, Sort.of(KORE.Sort("bar@FOO")), true);
         assertEquals(Collections.emptySet(), k1.variableSet());
         assertEquals(Collections.emptySet(), k1.variableSet);
         assertEquals(Collections.emptySet(), k1.kLabel().variableSet);
         assertEquals(Collections.emptySet(), k1.kList().variableSet);
 
         Variable v2 = new Variable("bar", Sort.of(KORE.Sort("baz@FOO")));
-        KItem k2 = new KItem(KLabelConstant.of(foo, definition), v2, null, Sort.of(KORE.Sort("bar@FOO")), true);
+        KItem k2 = new KItem(KLabelConstant.of(foo, definition), v2, globalContext, Sort.of(KORE.Sort("bar@FOO")), true);
         assertEquals(Collections.singleton(v2), k2.variableSet());
         assertEquals(Collections.singleton(v2), k2.variableSet);
         assertEquals(Collections.emptySet(), k2.kLabel().variableSet);
         assertEquals(Collections.singleton(v2), k2.kList().variableSet);
 
         Variable v3 = new Variable("baz", Sort.of(KORE.Sort("baz@FOO")));
         KList list = (KList) KList.concatenate(v3, k2);
-        KItem k3 = new KItem(KLabelConstant.of(foo, definition), list, null, Sort.of(KORE.Sort("bar@FOO")), true);
+        KItem k3 = new KItem(KLabelConstant.of(foo, definition), list, globalContext, Sort.of(KORE.Sort("bar@FOO")), true);
         assertEquals(Sets.newHashSet(v2, v3), k3.variableSet());
         assertEquals(Sets.newHashSet(v2, v3), k3.variableSet);
         assertEquals(Collections.emptySet(), k3.kLabel().variableSet);
@@ -71,18 +73,18 @@ public void testIsNormal() {
         Variable v1 = new Variable("foo", Sort.of(KORE.Sort("bar@FOO")));
         assertTrue(v1.isNormal());
 
-        KItem k1 = new KItem(KLabelConstant.of(foo, definition), KList.EMPTY, null, Sort.of(KORE.Sort("bar@FOO")), true);
+        KItem k1 = new KItem(KLabelConstant.of(foo, definition), KList.EMPTY, globalContext, Sort.of(KORE.Sort("bar@FOO")), true);
         assertTrue(k1.isNormal());
         assertTrue(k1.kLabel().isNormal());
         assertTrue(k1.kList().isNormal());
 
-        KItem k2 = new KItem(KLabelConstant.of(isFoo, definition), KList.EMPTY, null, Sort.of(KORE.Sort("bar@FOO")), true);
+        KItem k2 = new KItem(KLabelConstant.of(isFoo, definition), KList.EMPTY, globalContext, Sort.of(KORE.Sort("bar@FOO")), true);
         assertFalse(k2.isNormal());
         assertTrue(k2.kLabel().isNormal());
         assertTrue(k2.kList().isNormal());
 
         KList list = (KList) KList.concatenate(k1, k2);
-        KItem k3 = new KItem(KLabelConstant.of(foo, definition), list, null, Sort.of(KORE.Sort("bar@FOO")), true);
+        KItem k3 = new KItem(KLabelConstant.of(foo, definition), list, globalContext, Sort.of(KORE.Sort("bar@FOO")), true);
         assertFalse(k3.isNormal());
         assertTrue(k3.kLabel().isNormal());
         assertSame(list, k3.kList());
