4 files changed, 12 insertions, 12 deletions

diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
index e61f7b36..e403eec2 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
@@ -8,9 +8,6 @@ package tools.refinery.store.representation.cardinality;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
-import tools.refinery.store.representation.cardinality.UnboundedUpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -20,14 +17,14 @@ class UpperCardinalitiesTest {
         @ParameterizedTest
         @ValueSource(ints = {0, 1, 255, 256, 1000, Integer.MAX_VALUE})
         void valueOfBoundedTest(int value) {
-                var upperCardinality = UpperCardinalities.valueOf(value);
+                var upperCardinality = UpperCardinalities.atMost(value);
                 assertThat(upperCardinality, instanceOf(FiniteUpperCardinality.class));
                 assertThat(((FiniteUpperCardinality) upperCardinality).finiteUpperBound(), equalTo(value));
         }
 
         @Test
         void valueOfUnboundedTest() {
-                var upperCardinality = UpperCardinalities.valueOf(-1);
+                var upperCardinality = UpperCardinalities.atMost(-1);
                 assertThat(upperCardinality, instanceOf(UnboundedUpperCardinality.class));
         }
 }
diff --git a/subprojects/store/src/test/java/tools/refinery/store/statecoding/EquivalenceTest.java b/subprojects/store/src/test/java/tools/refinery/store/statecoding/EquivalenceTest.java
index 3c35849e..f2d2f7b5 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/statecoding/EquivalenceTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/statecoding/EquivalenceTest.java
@@ -192,7 +192,8 @@ class EquivalenceTest {
                 ModelStore store = ModelStore.builder()
                                 .symbols(person, age, friend, parents, population)
                                 .with(StateCoderAdapter.builder()
-                                                .stateCodeCalculatorFactory((p1, p2) -> calculator))
+                                                .stateCodeCalculatorFactory((ignoredModel, ignoredInterpretations, ignoredIndividuals) ->
+                                                                calculator))
                                 .build();
 
                 var stateCoder = store.getAdapter(StateCoderStoreAdapter.class);
diff --git a/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java b/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java
index 25b5dca1..f5ffc18d 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java
@@ -5,7 +5,8 @@
  */
 package tools.refinery.store.statecoding;
 
-import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
+import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
+import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -24,7 +25,6 @@ import java.util.Set;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 class ExperimentalSetupTest {
         static class ExperimentalSetupResult {
                 int versions = 0;
@@ -61,7 +61,7 @@ class ExperimentalSetupTest {
                                 .build();
 
                 Set<Version> versions = new HashSet<>();
-                IntObjectHashMap<List<Version>> codes = new IntObjectHashMap<>();
+                MutableIntObjectMap<List<Version>> codes = IntObjectMaps.mutable.empty();
 
                 var empty = store.createEmptyModel();
                 if (!permuteTypes) {
@@ -123,8 +123,9 @@ class ExperimentalSetupTest {
                 return result;
         }
 
-        private static void saveAsNewVersion(Set<Version> versions, IntObjectHashMap<List<Version>> codes,
-                                                                                 StateCoderStoreAdapter storeAdapter, ExperimentalSetupResult result, Model model) {
+        private static void saveAsNewVersion(Set<Version> versions, MutableIntObjectMap<List<Version>> codes,
+                                                                                 StateCoderStoreAdapter storeAdapter, ExperimentalSetupResult result,
+                                                                                 Model model) {
                 Version version1 = model.commit();
 
                 var stateCode = model.getAdapter(StateCoderAdapter.class).calculateStateCode();
diff --git a/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java b/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java
index 0b738005..0928aa8e 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/statecoding/StateCoderBuildTest.java
@@ -124,7 +124,8 @@ class StateCoderBuildTest {
                 var store = ModelStore.builder()
                                 .symbols(friend)
                                 .with(StateCoderAdapter.builder()
-                                                .stateCodeCalculatorFactory((interpretations, individuals) -> mock))
+                                                .stateCodeCalculatorFactory((ignoredModel, ignoredInterpretations, ignoredIndividuals) ->
+                                                                mock))
                                 .build();
 
                 var model = store.createEmptyModel();