From 2ace932b520ac401599cfa44914b37479be667d9 Mon Sep 17 00:00:00 2001 From: simon987 Date: Sat, 1 Aug 2020 21:22:13 -0400 Subject: [PATCH] Fix tests --- .../java/net/simon987/mar/server/assembly/TestHelper.java | 7 ++++--- .../server/assembly/instruction/IntInstructionTest.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/net/simon987/mar/server/assembly/TestHelper.java b/src/test/java/net/simon987/mar/server/assembly/TestHelper.java index c77e7c7..c45244f 100644 --- a/src/test/java/net/simon987/mar/server/assembly/TestHelper.java +++ b/src/test/java/net/simon987/mar/server/assembly/TestHelper.java @@ -36,10 +36,10 @@ public class TestHelper { } public static TestExecutionResult executeCode(String code) { - return executeCode(code, 100); + return executeCode(code, 10000); } - public static TestExecutionResult executeCode(String code, int timeout) { + public static TestExecutionResult executeCode(String code, int allocation) { AssemblyResult ar = getTestAsm().parse(code); CPU cpu = TestHelper.getTestCpu(); @@ -53,8 +53,9 @@ public class TestHelper { cpu.getMemory().write((char) ar.origin, assembledCode, 0, assembledCode.length); cpu.setCodeSectionOffset(ar.getCodeSectionOffset()); + cpu.setInstructionAlloction(allocation); cpu.reset(); - cpu.execute(timeout); + cpu.execute(); return new TestExecutionResult(cpu.getState(), host.callHistory, ar); } diff --git a/src/test/java/net/simon987/mar/server/assembly/instruction/IntInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/IntInstructionTest.java index f093fd6..b749c0d 100644 --- a/src/test/java/net/simon987/mar/server/assembly/instruction/IntInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/IntInstructionTest.java @@ -40,7 +40,7 @@ public class IntInstructionTest { "MOV Y, 0x4567 \n" + "brk \n"; - TestExecutionResult res = TestHelper.executeCode(code, 10); + TestExecutionResult res = TestHelper.executeCode(code, 30); assertEquals(0x1234, res.regValue("X")); assertEquals(0, res.regValue("Y"));