From fc7e313d4cd598dd58656f035091e663184c0987 Mon Sep 17 00:00:00 2001
From: Federico Berti <fberti146+git@gmail.com>
Date: Sat, 12 Oct 2024 14:57:41 +0100
Subject: [PATCH] m

---
 src/test/java/omegadrive/vdp/BaseVdpDmaBandwidthTest.java  | 4 ++++
 src/test/java/omegadrive/vdp/md/BaseVdpDmaHandlerTest.java | 6 +++++-
 src/test/java/omegadrive/vdp/md/GenesisVdpTest2.java       | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/test/java/omegadrive/vdp/BaseVdpDmaBandwidthTest.java b/src/test/java/omegadrive/vdp/BaseVdpDmaBandwidthTest.java
index 6c98f609..0b72397c 100644
--- a/src/test/java/omegadrive/vdp/BaseVdpDmaBandwidthTest.java
+++ b/src/test/java/omegadrive/vdp/BaseVdpDmaBandwidthTest.java
@@ -22,6 +22,7 @@
 import omegadrive.bus.model.GenesisBusProvider;
 import omegadrive.memory.IMemoryProvider;
 import omegadrive.util.LogHelper;
+import omegadrive.util.MdRuntimeData;
 import omegadrive.util.SystemTestUtil;
 import omegadrive.vdp.md.TestGenesisVdpMemoryInterface;
 import omegadrive.vdp.model.GenesisVdpProvider;
@@ -34,6 +35,8 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import static omegadrive.SystemLoader.SystemType.GENESIS;
+import static omegadrive.system.SystemProvider.NO_CLOCK;
 import static omegadrive.vdp.model.GenesisVdpProvider.VdpRegisterName.*;
 
 /**
@@ -79,6 +82,7 @@ public void setup() {
         vdpProvider = opt.get();
         memoryProvider = optMem.get();
         MdVdpTestUtil.vdpMode5(vdpProvider);
+        MdRuntimeData.newInstance(GENESIS, NO_CLOCK);
     }
 
     private void setup68kRam() {
diff --git a/src/test/java/omegadrive/vdp/md/BaseVdpDmaHandlerTest.java b/src/test/java/omegadrive/vdp/md/BaseVdpDmaHandlerTest.java
index c1268f4b..7ee06e49 100644
--- a/src/test/java/omegadrive/vdp/md/BaseVdpDmaHandlerTest.java
+++ b/src/test/java/omegadrive/vdp/md/BaseVdpDmaHandlerTest.java
@@ -19,6 +19,7 @@
 
 import omegadrive.bus.model.GenesisBusProvider;
 import omegadrive.util.LogHelper;
+import omegadrive.util.MdRuntimeData;
 import omegadrive.util.SystemTestUtil;
 import omegadrive.vdp.MdVdpTestUtil;
 import omegadrive.vdp.model.GenesisVdpProvider;
@@ -32,6 +33,8 @@
 import java.util.Optional;
 import java.util.stream.IntStream;
 
+import static omegadrive.SystemLoader.SystemType.GENESIS;
+import static omegadrive.system.SystemProvider.NO_CLOCK;
 import static omegadrive.vdp.model.GenesisVdpProvider.VdpRamType.VRAM;
 
 @Ignore
@@ -48,8 +51,9 @@ public void setup() {
         Optional<GenesisVdpProvider> opt = busProvider.getBusDeviceIfAny(GenesisVdpProvider.class);
         Assert.assertTrue(opt.isPresent());
         vdpProvider = opt.get();
-        memoryInterface = (VdpMemoryInterface) vdpProvider.getVdpMemory();
+        memoryInterface = vdpProvider.getVdpMemory();
         MdVdpTestUtil.vdpMode5(vdpProvider);
+        MdRuntimeData.newInstance(GENESIS, NO_CLOCK);
     }
 
     protected void testDMAFillInternal(int dmaFillLong, int increment,
diff --git a/src/test/java/omegadrive/vdp/md/GenesisVdpTest2.java b/src/test/java/omegadrive/vdp/md/GenesisVdpTest2.java
index afad1b3e..3295d095 100644
--- a/src/test/java/omegadrive/vdp/md/GenesisVdpTest2.java
+++ b/src/test/java/omegadrive/vdp/md/GenesisVdpTest2.java
@@ -21,6 +21,7 @@
 
 import omegadrive.bus.model.GenesisBusProvider;
 import omegadrive.util.LogHelper;
+import omegadrive.util.MdRuntimeData;
 import omegadrive.util.Size;
 import omegadrive.util.SystemTestUtil;
 import omegadrive.vdp.MdVdpTestUtil;
@@ -34,7 +35,9 @@
 
 import java.util.Optional;
 
+import static omegadrive.SystemLoader.SystemType.GENESIS;
 import static omegadrive.bus.model.GenesisBusProvider.VDP_ADDRESS_SPACE_START;
+import static omegadrive.system.SystemProvider.NO_CLOCK;
 import static omegadrive.vdp.model.GenesisVdpProvider.VdpRamType.*;
 import static omegadrive.vdp.model.GenesisVdpProvider.VramMode.*;
 
@@ -54,7 +57,8 @@ public void setup() {
         Optional<GenesisVdpProvider> opt = busProvider.getBusDeviceIfAny(GenesisVdpProvider.class);
         Assert.assertTrue(opt.isPresent());
         vdpProvider = opt.get();
-        memoryInterface = (VdpMemoryInterface) vdpProvider.getVdpMemory();
+        memoryInterface = vdpProvider.getVdpMemory();
+        MdRuntimeData.newInstance(GENESIS, NO_CLOCK);
     }