From 2069579ce57dbaf04bff610f8151409e25bf114a Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Sun, 18 Jun 2023 14:12:20 +0200
Subject: refactor: clean up Symbol constructor

Shorthad syntax for the most commonly used symbol types.
---
 .../refinery/store/model/tests/ModelTest.java      | 24 +++++-----------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'subprojects/store/src/test/java')

diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
index 1017ff28..56b75804 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
@@ -14,27 +14,24 @@ import tools.refinery.store.tuple.Tuple;
 import static org.junit.jupiter.api.Assertions.*;
 
 class ModelTest {
+	private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+	private static final Symbol<Integer> age = Symbol.of("age", 1, Integer.class);
+	private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+
 	@Test
 	void modelConstructionTest() {
-		var person = new Symbol<>("Person", 1, Boolean.class, false);
-		var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
 		var store = ModelStore.builder().symbols(person, friend).build();
 		var symbols = store.getSymbols();
 
 		assertTrue(symbols.contains(person));
 		assertTrue(symbols.contains(friend));
 
-		var other = new Symbol<>("other", 2, Integer.class, null);
+		var other = Symbol.of("other", 2, Integer.class);
 		assertFalse(symbols.contains(other));
 	}
 
 	@Test
 	void modelBuildingTest() {
-		var person = new Symbol<>("Person", 1, Boolean.class, false);
-		var age = new Symbol<>("age", 1, Integer.class, null);
-		var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
 		var store = ModelStore.builder().symbols(person, age, friend).build();
 		var model = store.createEmptyModel();
 		var personInterpretation = model.getInterpretation(person);
@@ -62,8 +59,6 @@ class ModelTest {
 
 	@Test
 	void modelBuildingArityFailTest() {
-		var person = new Symbol<>("Person", 1, Boolean.class, false);
-
 		var store = ModelStore.builder().symbols(person).build();
 		var model = store.createEmptyModel();
 		var personInterpretation = model.getInterpretation(person);
@@ -75,8 +70,6 @@ class ModelTest {
 
 	@Test
 	void modelBuildingNullFailTest() {
-		var age = new Symbol<>("age", 1, Integer.class, null);
-
 		var store = ModelStore.builder().symbols(age).build();
 		var model = store.createEmptyModel();
 		var ageInterpretation = model.getInterpretation(age);
@@ -89,10 +82,6 @@ class ModelTest {
 
 	@Test
 	void modelUpdateTest() {
-		var person = new Symbol<>("Person", 1, Boolean.class, false);
-		var age = new Symbol<>("age", 1, Integer.class, null);
-		var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
 		var store = ModelStore.builder().symbols(person, age, friend).build();
 		var model = store.createEmptyModel();
 		var personInterpretation = model.getInterpretation(person);
@@ -118,9 +107,6 @@ class ModelTest {
 
 	@Test
 	void restoreTest() {
-		var person = new Symbol<>("Person", 1, Boolean.class, false);
-		var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
 		var store = ModelStore.builder().symbols(person, friend).build();
 		var model = store.createEmptyModel();
 		var personInterpretation = model.getInterpretation(person);
-- 
cgit v1.2.3-70-g09d2