natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded to the latest Kotlin beta

This commit is contained in:
Fedor Isakov 2015-12-23 16:43:37 +01:00
parent a3346ae57f
commit a58af2c921
15 changed files with 46 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_beta_3595.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_compiler_1_0_0_beta_4583.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-3595">
<library name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-4583">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-beta-3595/kotlin-compiler-1.0.0-beta-3595.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-beta-4583/kotlin-compiler-1.0.0-beta-4583.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-beta-3595/kotlin-compiler-1.0.0-beta-3595-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-beta-4583/kotlin-compiler-1.0.0-beta-4583-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-beta-3595/kotlin-compiler-1.0.0-beta-3595-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler/1.0.0-beta-4583/kotlin-compiler-1.0.0-beta-4583-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_beta_3595.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_maven_plugin_1_0_0_beta_4583.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-3595">
<library name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-4583">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-beta-3595/kotlin-maven-plugin-1.0.0-beta-3595.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-beta-4583/kotlin-maven-plugin-1.0.0-beta-4583.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-beta-3595/kotlin-maven-plugin-1.0.0-beta-3595-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-beta-4583/kotlin-maven-plugin-1.0.0-beta-4583-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-beta-3595/kotlin-maven-plugin-1.0.0-beta-3595-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-maven-plugin/1.0.0-beta-4583/kotlin-maven-plugin-1.0.0-beta-4583-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_4583.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595">
<library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-4583">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4583/kotlin-runtime-1.0.0-beta-4583.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4583/kotlin-runtime-1.0.0-beta-4583-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4583/kotlin-runtime-1.0.0-beta-4583-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml → reactor/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_4583.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-4583">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4583/kotlin-stdlib-1.0.0-beta-4583.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4583/kotlin-stdlib-1.0.0-beta-4583-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4583/kotlin-stdlib-1.0.0-beta-4583-sources.jar!/" />
</SOURCES>
</library>
</component>

12
reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_runtime_1_0_0_beta_3595.xml
View File

@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595-sources.jar!/" />
</SOURCES>
</library>
</component>

13
reactor/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_0_0_beta_3595.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-3595/kotlin-runtime-1.0.0-beta-3595.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-3595/kotlin-stdlib-1.0.0-beta-3595-sources.jar!/" />
</SOURCES>
</library>
</component>

8
reactor/API/API.iml
View File

@ -11,9 +11,9 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="com.intellij:annotations:12.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -38,7 +38,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

10
reactor/Core/Core.iml
View File

@ -13,13 +13,11 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.intellij:annotations:12.0" level="project" />
<orderEntry type="library" name="com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="code-1.0" level="project" />
<orderEntry type="module" module-name="API" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -44,7 +42,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

8
reactor/Reactor.iml
View File

@ -9,9 +9,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -36,7 +36,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

10
reactor/Test/Test.iml
View File

@ -13,16 +13,14 @@
<orderEntry type="library" name="junit:junit:4.12" level="project" />
<orderEntry type="library" name="com.intellij:annotations:12.0" level="project" />
<orderEntry type="library" name="com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="code-1.0" level="project" />
<orderEntry type="module" module-name="API" />
<orderEntry type="module" module-name="Core" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
@ -47,7 +45,7 @@
<orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-3595" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-beta-4583" level="project" />
<orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
<orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />

7
reactor/Test/test/TestBasicProgram.kt
View File

@ -6,11 +6,8 @@ import jetbrains.mps.logic.reactor.core.ReactorPlanningSession
import jetbrains.mps.logic.reactor.predicate.ReactorSessionSolver
import jetbrains.mps.logic.reactor.program.EvaluationSession
import jetbrains.mps.logic.reactor.program.PlanningSession
import org.junit.AfterClass
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
import kotlin.test.assertEquals
import org.junit.*
import org.junit.Assert.*
/**
* @author Fedor Isakov

4
reactor/Test/test/TestHandler.kt
View File

@ -3,12 +3,10 @@ import jetbrains.mps.logic.reactor.core.Handler
import jetbrains.mps.logic.reactor.logical.Logical
import jetbrains.mps.logic.reactor.logical.LogicalPattern
import jetbrains.mps.logic.reactor.predicate.ReactorSessionSolver
import org.junit.Assert.*
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
/**
* @author Fedor Isakov

21
reactor/Test/test/TestMatcher.kt
View File

@ -2,11 +2,8 @@ import jetbrains.mps.logic.reactor.constraint.Constraint
import jetbrains.mps.logic.reactor.constraint.ConstraintOccurrence
import jetbrains.mps.logic.reactor.core.Matcher
import jetbrains.mps.logic.reactor.core.matches
import org.junit.Assert
import org.junit.Assert.*
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
/**
* @author Fedor Isakov
@ -64,9 +61,9 @@ class TestMatcher {
))
).matcher().run{
lookupMatches(occurrence("main")).let { matches ->
assertFalse { matches.any { m -> m.isPartial() } }
assertFalse(matches.any { m -> m.isPartial() })
assertEquals(rules, matches.map { m -> m.rule })
matches.forEach { m -> assertTrue { m.kept.size() + m.discarded.size() == 1 } }
matches.forEach { m -> assertTrue(m.kept.size() + m.discarded.size() == 1) }
matches.flatMap { m -> m.kept + m.discarded }.forEach { pair ->
val (cst, occ) = pair
assert(cst.symbol().id() == "main")
@ -97,7 +94,7 @@ class TestMatcher {
))
).matcher().run{
lookupMatches(occurrence("main")).let { matches ->
assertFalse { matches.any { m -> m.isPartial() } }
assertFalse(matches.any { m -> m.isPartial() })
assertEquals(rules.drop(1), matches.map { m -> m.rule })
}
}
@ -125,7 +122,7 @@ class TestMatcher {
))
).matcher(occurrence("aux")).run {
lookupMatches(occurrence("main")).let { matches ->
assertFalse { matches.any { m -> m.isPartial() } }
assertFalse(matches.any { m -> m.isPartial() })
assertEquals(rules, matches.map { m -> m.rule })
}
}
@ -150,7 +147,7 @@ class TestMatcher {
))
).matcher().run{
lookupMatches(occurrence("main", "bar")).let { matches ->
assertFalse { matches.any { m -> m.isPartial() } }
assertFalse(matches.any { m -> m.isPartial() })
assertEquals(rules.drop(1), matches.map { m -> m.rule })
}
}
@ -196,8 +193,8 @@ class TestMatcher {
)
).matcher().lookupMatches(occurrence("foo", "blah", b)).first().run {
assertEquals("blah", logicalContext().valueFor(A))
Assert.assertSame(b, logicalContext().valueFor(B))
assertEquals<Any>(C.instance(), logicalContext().valueFor(C))
assertSame(b, logicalContext().valueFor(B))
assertEquals(C.instance(), logicalContext().valueFor(C))
}
}
@ -242,7 +239,7 @@ class TestMatcher {
assertEquals(2, matches.count())
assertEquals(listOf("main1", "main1"), matches.map { m -> m.rule.tag() })
matches.map { m -> setOf(M, N).map { lp -> m.logicalContext().valueFor(lp) } }.forEach { vals ->
assertEquals<Any>(setOf(42, 16), vals.toSet())
assertEquals(setOf(42, 16), vals.toSet())
}
assertTrue(matches.all{ m -> m.occurrences().toSet().size == 2 })
}

3
reactor/Test/test/TestPlanningSession.kt
View File

@ -6,13 +6,12 @@ import jetbrains.mps.logic.reactor.rule.InvalidConstraintException
import jetbrains.mps.logic.reactor.rule.InvalidRuleException
import jetbrains.mps.logic.reactor.core.ReactorPlanningSession
import jetbrains.mps.logic.reactor.predicate.ReactorSessionSolver
import org.junit.Assert.*
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
import java.util.*
import kotlin.reflect.KClass
import kotlin.test.assertEquals
import kotlin.test.expect
/**
* @author Fedor Isakov

2
reactor/pom.xml
View File

@ -8,7 +8,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>1.0.0-beta-3595</kotlin.version>
<kotlin.version>1.0.0-beta-4583</kotlin.version>
</properties>
<groupId>jetbrains.mps.logic.reactor</groupId>