Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
1 result

Target

Select target project
  • tmiller/SWEN90006-A1-2018
  • cbalasuriya/SWEN90006-A1-2018
  • zhangyuny/SWEN90006-A1-2018
  • zhaor4/SWEN90006-A1-2018
  • nelsonc1/SWEN90006-A1-2018
  • jiamingz3/SWEN90006-A1-2018
  • cvidler/SWEN90006-A1-2018
  • 923841/SWEN90006-A1-2018
  • hzhu5/SWEN90006-A1-2018
  • zhuoyaof/SWEN90006-A1-2018
  • haoyangc/SWEN90006-A1-2018
  • austinl/SWEN90006-A1-2018
  • gxuan/SWEN90006-A1-2018
  • zlang/SWEN90006-A1-2018
  • junhany/SWEN90006-A1-2018
  • shibaoz/SWEN90006-A1-2018
  • arwinders/SWEN90006-A1-2018
  • jiankunc/SWEN90006-A1-2018
  • xujiaz/SWEN90006-A1-2018
  • xiaomingz/SWEN90006-A1-2018
  • xixiangw/SWEN90006-A1-2018
  • yunchengw/SWEN90006-A1-2018
  • abdulk/SWEN90006-A1-2018
  • yangz7/SWEN90006-A1-2018
  • linyuanz/SWEN90006-A1-2018
  • zhaolind/SWEN90006-A1-2018
  • jingjiahuil/SWEN90006-A1-2018
  • hongyic3/SWEN90006-A1-2018
  • zhouw4/SWEN90006-A1-2018
  • emilylm/SWEN90006-A1-2018
  • jingez1/SWEN90006-A1-2018
  • minzhex/SWEN90006-A1-2018
32 results
Select Git revision
  • master
1 result
Show changes

Commits on Source 4

......@@ -148,7 +148,7 @@ public class Machine
private void validate_offset(int offset)
throws InvalidInstructionException
{
if (offset < -MAX_ADDR || offset > MAX_ADDR) {
if (offset < -MAX_ADDR || offset > MAX_ADDR+1) {
throw new InvalidInstructionException();
}
}
......
......@@ -83,7 +83,7 @@ public class Machine
private void do_load(int dest, int src, int offs) {
if (regs[src] + offs > MAX_ADDR){
/* no op */
}else if(regs[src] + offs < 0){
}else if(regs[src] - offs < 0){
/* no op */
}else{
regs[dest] = memory[regs[src] + offs];
......
......@@ -25,66 +25,303 @@ public class BoundaryTests
}
//Any method annotation with "@Test" is executed as a test.
@Test public void aTest()
@Test public void EC1B1()
{
//the assertEquals method used to check whether two values are
//equal, using the equals method
final int expected = 2;
final int actual = 1 + 1;
assertEquals(expected, actual);
String a="RET R0;";
final List<String> list = new ArrayList<String>();
list.add(a);
Machine m = new Machine();
assertEquals(m.execute(list), 0);
}
@Test public void anotherTest()
@Test public void EC1B2()
{
List<String> list = new ArrayList<String>();
list.add("a");
list.add("b");
String a="RET R31;";
final List<String> list = new ArrayList<String>();
list.add(a);
Machine m = new Machine();
assertEquals(m.execute(list), 0);
}
//the assertTrue method is used to check whether something holds.
assertTrue(list.contains("a"));
@Test(expected=InvalidInstructionException.class)
public void EC2B1()
throws Throwable
{
String a="RET R33;";
final List<String> list = new ArrayList<String>();
list.add(a);
Machine machine = new Machine();
assertEquals("Invalid",machine.execute(list),InvalidInstructionException.class);
}
//Test test opens a file and executes the machine
@Test public void aFileOpenTest()
@Test public void EC5B1()
{
String a="MOV R2 1;";
String b="MOV R1 2;";
String c="ADD R0 R1 R2;";
String d="RET R0;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list), 3);
}
@Test public void EC5B2()
{
final List<String> lines = readInstructions("examples/array.s");
String a="MOV R2 1;";
String b="MOV R1 2;";
String c="ADD R31 R1 R2;";
String d="RET R31;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(lines), 45);
assertEquals(m.execute(list), 3);
}
@Test(expected=InvalidInstructionException.class)
public void EC6B1()
{
String a="MOV R0 1;";
String b="MOV R1 2;";
String c="ADD R32 R1 R2;";
String d="RET R32;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
//To test an exception, specify the expected exception after the @Test
@Test(expected = java.io.IOException.class)
public void anExceptionTest()
throws Throwable
@Test public void EC7()
{
String a="MOV R1 6;";
String b="MOV R2 0;";
String d="DIV R3 R1 R2;";
String e="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(d);
list.add(e);
Machine m = new Machine();
assertEquals(m.execute(list), 0);
}
@Test public void EC8()
{
String a="MOV R1 6;";
String b="MOV R2 2;";
String c="MOV R3 6;";
String d="DIV R3 R1 R2;";
String e="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
list.add(e);
Machine m = new Machine();
assertEquals(m.execute(list), 3);
}
@Test public void EC9B1()
{
String a="MOV R3 65535;";
String b="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
Machine m = new Machine();
assertEquals(m.execute(list), 65535);
}
@Test public void EC9B2()
{
String a="MOV R3 -65535;";
String b="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
Machine m = new Machine();
assertEquals(m.execute(list), -65535);
}
@Test(expected=InvalidInstructionException.class)
public void EC10B1()
{
String a="MOV R3 -65536";
String b="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test(expected=InvalidInstructionException.class)
public void EC10B2()
{
String a="MOV R3 65536";
String b="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test(expected=InvalidInstructionException.class)
public void EC12B1()
{
throw new java.io.IOException();
String a="MOV R1 0;";
String b="MOV R2 7;";
String c="LDR R2 R1 65536;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
//This test should fail.
//To provide additional feedback when a test fails, an error message
//can be included
@Test public void aFailedTest()
@Test(expected=InvalidInstructionException.class)
public void EC12B2()
{
String a="MOV R1 0;";
String b="MOV R2 7;";
String c="LDR R2 R1 -65536;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test(expected=NoReturnValueException.class)
public void EC14B1()
{
//include a message for better feedback
final int expected = 2;
final int actual = 1 + 2;
assertEquals("Some failure message", expected, actual);
String b="JMP 65535;";
final List<String> list = new ArrayList<String>();
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),NoReturnValueException.class);
}
//Read in a file containing a program and convert into a list of
//string instructions
private List<String> readInstructions(String file)
@Test(expected=NoReturnValueException.class)
public void EC14B2()
{
Charset charset = Charset.forName("UTF-8");
List<String> lines = null;
try {
lines = Files.readAllLines(FileSystems.getDefault().getPath(file), charset);
String b="JMP -65535;";
final List<String> list = new ArrayList<String>();
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),NoReturnValueException.class);
}
catch (Exception e){
System.err.println("Invalid input file! (stacktrace follows)");
e.printStackTrace(System.err);
System.exit(1);
@Test(expected=InvalidInstructionException.class)
public void EC15B1()
{
String b="JMP -65536;";
final List<String> list = new ArrayList<String>();
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
return lines;
@Test(expected=InvalidInstructionException.class)
public void EC15B2()
{
String b="JMP 65536;";
final List<String> list = new ArrayList<String>();
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
/*
* [EC16]: {list|length>1/\INSTUCTION=LDR/\regsi in [R0,R1,...,R31]/\vali in[-65536,65535]/\reg[a]+offs>65535} invalid
MOV R1 1; MOV R2 7; LDR R2 R1 65535; RET R2;
*/
@Test(expected=InvalidInstructionException.class)
public void EC16()
{
String a="MOV R1 1;";
String b="MOV R2 7;";
String c="LDR R2 R1 65535;";
String d="RET 0;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test
public void EC17B1()
{
String a="MOV R1 1;";
String b="MOV R2 7;";
String c="LDR R2 R1 65534;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list),0);
}
@Test
public void EC17B2()
{
String a="MOV R1 0;";
String b="MOV R2 7;";
String c="LDR R2 R1 0;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list),0);
}
@Test
public void EC18()
{
String a="MOV R1 -1;";
String b="MOV R2 7;";
String c="LDR R2 R1 0;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list),7);
}
}
......@@ -8,6 +8,8 @@ import java.nio.file.Files;
import java.nio.file.FileSystems;
import org.junit.*;
import org.junit.rules.ExpectedException;
import static org.junit.Assert.*;
public class PartitioningTests
......@@ -25,66 +27,215 @@ public class PartitioningTests
}
//Any method annotation with "@Test" is executed as a test.
@Test public void aTest()
@Test public void EC1()
{
String a="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
Machine m = new Machine();
assertEquals(m.execute(list), 0);
}
@Test(expected=InvalidInstructionException.class)
public void EC2()
throws Throwable
{
//the assertEquals method used to check whether two values are
//equal, using the equals method
final int expected = 2;
final int actual = 1 + 1;
assertEquals(expected, actual);
String a="RET R33;";
final List<String> list = new ArrayList<String>();
list.add(a);
Machine machine = new Machine();
assertEquals("Invalid",machine.execute(list),InvalidInstructionException.class);
}
@Test public void anotherTest()
@Test(expected=NoReturnValueException.class)
public void EC3()
{
List<String> list = new ArrayList<String>();
list.add("a");
list.add("b");
String a="MOV R0 1;";
final List<String> list = new ArrayList<String>();
list.add(a);
//the assertTrue method is used to check whether something holds.
assertTrue(list.contains("a"));
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),NoReturnValueException.class);
}
//Test test opens a file and executes the machine
@Test public void aFileOpenTest()
@Test public void EC4()
{
final List<String> lines = readInstructions("examples/array.s");
String a="MOV R2 1;";
String b="MOV R1 2;";
String c="ADD R3 R1 R2;";
String d="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(lines), 45);
assertEquals(m.execute(list), 3);
}
//To test an exception, specify the expected exception after the @Test
@Test(expected = java.io.IOException.class)
public void anExceptionTest()
throws Throwable
@Test(expected=InvalidInstructionException.class)
public void EC5()
{
String a="MOV R0 1;";
String b="MOV R1 2;";
String c="ADD R35 R1 R2;";
String d="RET R35;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test public void EC6()
{
String a="MOV R1 6;";
String b="MOV R2 2;";
String c="MOV R3 6;";
String d="DIV R3 R1 R2;";
String e="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
list.add(e);
Machine m = new Machine();
assertEquals(m.execute(list), 3);
}
@Test public void EC7()
{
String a="MOV R1 6;";
String b="MOV R2 0;";
String d="DIV R3 R1 R2;";
String e="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(d);
list.add(e);
Machine m = new Machine();
assertEquals(m.execute(list), 0);
}
@Test public void EC8()
{
String a="MOV R3 65535;";
String b="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
Machine m = new Machine();
assertEquals(m.execute(list), 65535);
}
/*
* [EC10]: {list|length>1/\INSTUCTION in [MOV,JZ]/\regsi in [R0,R1,...,R31]/\vali not in[-65536,65535]} invalid
MOV R3 65536; RET R3;
*/
@Test(expected=InvalidInstructionException.class)
public void EC9()
{
String a="MOV R3 65536";
String b="RET R3;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test(expected=NoReturnValueException.class)
public void EC10()
{
throw new java.io.IOException();
String b="JMP 65535;";
final List<String> list = new ArrayList<String>();
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),NoReturnValueException.class);
}
//This test should fail.
//To provide additional feedback when a test fails, an error message
//can be included
@Test public void aFailedTest()
@Test(expected=InvalidInstructionException.class)
public void EC11()
{
//include a message for better feedback
final int expected = 2;
final int actual = 1 + 2;
assertEquals("Some failure message", expected, actual);
String b="JMP -65536;";
final List<String> list = new ArrayList<String>();
list.add(b);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
//Read in a file containing a program and convert into a list of
//string instructions
private List<String> readInstructions(String file)
@Test(expected=InvalidInstructionException.class)
public void EC12()
{
String a="MOV R1 0;";
String b="MOV R2 7;";
String c="LDR R2 R1 65536;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals("Invalid",m.execute(list),InvalidInstructionException.class);
}
@Test
public void EC13()
{
Charset charset = Charset.forName("UTF-8");
List<String> lines = null;
try {
lines = Files.readAllLines(FileSystems.getDefault().getPath(file), charset);
String a="MOV R1 2;";
String b="MOV R2 7;";
String c="LDR R2 R1 65534;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list),7);
}
catch (Exception e){
System.err.println("Invalid input file! (stacktrace follows)");
e.printStackTrace(System.err);
System.exit(1);
@Test
public void EC14()
{
String a="MOV R1 55;";
String b="MOV R2 7;";
String c="LDR R2 R1 -44;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list),0);
}
return lines;
@Test
public void EC15()
{
String a="MOV R1 -1;";
String b="MOV R2 7;";
String c="LDR R2 R1 0;";
String d="RET R2;";
final List<String> list = new ArrayList<String>();
list.add(a);
list.add(b);
list.add(c);
list.add(d);
Machine m = new Machine();
assertEquals(m.execute(list),7);
}
}