X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Futil%2FTestEnvironmentHelper.java;h=5adf93d0c4dabaa9f03929a07222c1b456d04808;hb=ad3cfc5aa856c1329943f1aafbfd513b60636aaa;hp=4bae8ec5adf890b4c29f9b9376a515af981b03dc;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java
index 4bae8ec5..5adf93d0 100644
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java
@@ -27,8 +27,9 @@ import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.wires.ModelWire;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.modeladapter.CoreModelParameters;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters.CoreModelParametersBuilder;
 import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
+import net.mograsim.logic.model.preferences.DefaultRenderPreferences;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.util.ModellingTool;
 
@@ -50,7 +51,7 @@ public class TestEnvironmentHelper
 	private DebugState debug = DebugState.NO_DEBUG;
 	private Set<String> wireDebugChangeSet;
 	private boolean debugWires = false;
-	public int debugEventThreshold = 10_000;
+	public int debugEventThreshold = 20_000;
 	public int debugEventCount = 500;
 	private int eventCounter;
 
@@ -88,10 +89,11 @@ public class TestEnvironmentHelper
 		component.getPins().values().forEach(this::extendModelPin);
 
 		// Create core model
-		CoreModelParameters params = new CoreModelParameters();
-		params.gateProcessTime = 50;
-		params.wireTravelTime = 10;
-		timeline = LogicCoreAdapter.convert(logicModel, params);
+		CoreModelParametersBuilder paramsBuilder = new CoreModelParametersBuilder();
+		paramsBuilder.gateProcessTime = 50;
+		paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5;
+		paramsBuilder.wireTravelTime = 10;
+		timeline = LogicCoreAdapter.convert(logicModel, paramsBuilder.build());
 		timelineField.ifPresent(f -> setField(f, timeline));
 
 		// Bind switches/displays to this test class
@@ -260,7 +262,7 @@ public class TestEnvironmentHelper
 	{
 		try
 		{
-			new LogicUIStandaloneGUI(logicModel).run();
+			new LogicUIStandaloneGUI(logicModel, new DefaultRenderPreferences()).run();
 			logicModel.setRedrawHandler(null);
 		}
 		catch (Exception e)