X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=tests%2Forg.simantics.scl.compiler.tests%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Ftests%2Funit%2FTestCHRCodeGenerator.java;h=9d9582e5ce064ad092fea63b25ee5d74b4d8b904;hb=e12e3ad357853a07b24923b341c4732962a94623;hp=87bd50aa25fa7beda114fb343321a98912a88b4f;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java
index 87bd50aa2..9d9582e5c 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/unit/TestCHRCodeGenerator.java
@@ -5,6 +5,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.simantics.scl.compiler.compilation.CompilationContext;
 import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
@@ -12,7 +13,7 @@ import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint;
 import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint.IndexInfo;
 import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification;
 import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.codegen.chr.CHRCodeGenerator;
+import org.simantics.scl.compiler.internal.codegen.chr.CHRRuntimeRulesetCodeGenerator;
 import org.simantics.scl.compiler.internal.codegen.types.JavaTypeTranslator;
 import org.simantics.scl.compiler.internal.codegen.utils.JavaNamingPolicy;
 import org.simantics.scl.compiler.internal.codegen.utils.ModuleBuilder;
@@ -24,6 +25,7 @@ import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 
 public class TestCHRCodeGenerator {
+    @Ignore
     @Test
     public void testCodeGenerator() throws Throwable {
         try {
@@ -39,7 +41,7 @@ public class TestCHRCodeGenerator {
             
             CHRRuleset ruleset = new CHRRuleset(); 
             CHRConstraint exampleFact = new CHRConstraint(Locations.NO_LOCATION, "ExampleFact", new Type[] { Types.INTEGER, Types.INTEGER });
-            ruleset.constraints.add(exampleFact);
+            ruleset.addConstraint(exampleFact);
     
             System.out.println("==============================================================================================");
             ruleset.initializeCodeGeneration(compilationContext);
@@ -49,12 +51,12 @@ public class TestCHRCodeGenerator {
             exampleFact.indices.put(3, new IndexInfo(3, "bb", null, null));
             exampleFact.setMayBeRemoved();
 
-            CHRCodeGenerator.generateStore(moduleBuilder, ruleset);
+            CHRRuntimeRulesetCodeGenerator.generateRuntimeRuleset(moduleBuilder, ruleset);
             
             MutableClassLoader classLoader = environment.getMutableClassLoader();
             classLoader.addClasses(moduleBuilder.getClasses());
             
-            String storeClassName = ruleset.storeClassName.replace('/', '.');
+            String storeClassName = ruleset.runtimeRulesetClassName.replace('/', '.');
             Class<?> storeClass = classLoader.loadClass(storeClassName);
             Class<?> factClass = classLoader.loadClass(storeClassName+"$ExampleFact");
             Constructor<?> factConstructor = factClass.getConstructor(int.class, int.class, int.class);