diff --git a/Platform/Apple/tools/jace/src/main/java/jace/core/Computer.java b/Platform/Apple/tools/jace/src/main/java/jace/core/Computer.java index faee90b5..e466ca99 100644 --- a/Platform/Apple/tools/jace/src/main/java/jace/core/Computer.java +++ b/Platform/Apple/tools/jace/src/main/java/jace/core/Computer.java @@ -22,7 +22,6 @@ import java.util.concurrent.CompletableFuture; import jace.Emulator; import jace.LawlessLegends; -import jace.apple2e.SoftSwitches; import jace.config.ConfigurableField; import jace.config.Configuration; import jace.config.InvokableAction; diff --git a/Platform/Apple/tools/jace/src/test/java/jace/apple2e/Full65C02Test.java b/Platform/Apple/tools/jace/src/test/java/jace/apple2e/Full65C02Test.java index 6fb9bd82..d174894a 100644 --- a/Platform/Apple/tools/jace/src/test/java/jace/apple2e/Full65C02Test.java +++ b/Platform/Apple/tools/jace/src/test/java/jace/apple2e/Full65C02Test.java @@ -400,18 +400,18 @@ public class Full65C02Test { new TestProgram() .add("LDA #$FF") .add("STA $FF") - .assertTimed("BIT #0", 2) - .assertFlags(IS_ZERO, POSITIVE, OVERFLOW_CLEAR) - .assertTimed("BIT #$FF", 2) + .assertTimed("BIT #0", 3) + .assertFlags(IS_ZERO, NEGATIVE, OVERFLOW_CLEAR) + .assertTimed("BIT #$FF", 3) .assertFlags(NOT_ZERO, NEGATIVE, OVERFLOW_CLEAR) .assertTimed("BIT $FF", 3) .assertFlags(NOT_ZERO, NEGATIVE, OVERFLOW_SET) .add("CLV") .add("LDA #$40") - .assertTimed("BIT #$40", 2) + .assertTimed("BIT #$40", 3) .assertFlags(NOT_ZERO, POSITIVE, OVERFLOW_CLEAR) - .assertTimed("BIT #$80", 2) - .assertFlags(IS_ZERO, NEGATIVE, OVERFLOW_CLEAR) + .assertTimed("BIT #$80", 3) + .assertFlags(IS_ZERO, POSITIVE, OVERFLOW_CLEAR) .assertTimed("BIT $1000", 4) .assertTimed("BIT $1000,x", 4) .assertTimed("BIT $00,X", 4) diff --git a/Platform/Apple/tools/jace/src/test/java/jace/hardware/FloppyDiskTest.java b/Platform/Apple/tools/jace/src/test/java/jace/hardware/FloppyDiskTest.java index 1c6fd92f..d13fed72 100644 --- a/Platform/Apple/tools/jace/src/test/java/jace/hardware/FloppyDiskTest.java +++ b/Platform/Apple/tools/jace/src/test/java/jace/hardware/FloppyDiskTest.java @@ -1,5 +1,6 @@ package jace.hardware; import jace.AbstractFXTest; +import jace.hardware.FloppyDisk.SectorOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -31,7 +32,7 @@ public class FloppyDiskTest extends AbstractFXTest { ByteArrayInputStream diskInputStream = new ByteArrayInputStream(diskData); // Read the disk file - floppyDisk.readDisk(diskInputStream, false); + floppyDisk.readDisk(diskInputStream, SectorOrder.DOS); // Verify the disk properties assert(floppyDisk.isNibblizedImage);