change

README.TXT

@@ -10,4 +10,6 @@ except for the addition of an "Address" class and an address attribute
 in Person.
 
 This project may be used to study object creation and method calls from
-within other object (non-interactive).
+within other object (non-inter	
+
+Ben Blinebury

StaffTest.java

@@ -0,0 +1,55 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class StaffTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class StaffTest
+{
+    /**
+     * Default constructor for test class StaffTest
+     */
+    public StaffTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+
+    @Test
+    public void test1()
+    {
+        Staff staff3 = new Staff("Kris", 1999, "123");
+        assertEquals(test "123", staff3.getRoom());
+        assertEquals(, staff3.getRoom());
+        assertEquals("re 123'", staff3.getRoom());
+        assertEquals("rm 123", staff3.getRoom());
+        assertEquals("rm 2b", staff3.getRoom());
+        assertEquals("rm 123", staff3.getRoom());
+    }
+}
+

Teacher.java

@@ -0,0 +1,33 @@
+
+/**
+ * Write a description of class Teacher here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class Teacher extends Person
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class Teacher
+     */
+    public Teacher()
+    {
+        // initialise instance variables
+        x = 0;
+    }
+
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    public int sampleMethod(int y)
+    {
+        // put your code here
+        return x + y;
+    }
+}

package.bluej

@@ -5,22 +5,25 @@ dependency1.type=UsesDependency
 dependency2.from=Person
 dependency2.to=Address
 dependency2.type=UsesDependency
+dependency3.from=StaffTest
+dependency3.to=Staff
+dependency3.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=2941
-editor.fx.0.y=59
+editor.fx.0.x=640
+editor.fx.0.y=48
 objectbench.height=106
-objectbench.width=461
+objectbench.width=776
 package.divider.horizontal=0.6
 package.divider.vertical=0.7915129151291513
 package.editor.height=422
 package.editor.width=674
-package.editor.x=2110
-package.editor.y=77
+package.editor.x=100
+package.editor.y=100
 package.frame.height=600
 package.frame.width=800
-package.numDependencies=2
-package.numTargets=5
+package.numDependencies=3
+package.numTargets=7
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -36,6 +39,7 @@ target1.type=ClassTarget
 target1.width=80
 target1.x=300
 target1.y=20
+target2.association=StaffTest
 target2.height=50
 target2.name=Staff
 target2.showInterface=false
@@ -51,16 +55,30 @@ target3.width=80
 target3.x=90
 target3.y=40
 target4.height=50
-target4.name=Student
+target4.name=Teacher
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=80
-target4.x=260
-target4.y=220
+target4.x=390
+target4.y=170
 target5.height=50
-target5.name=Person
+target5.name=StaffTest
 target5.showInterface=false
-target5.type=AbstractTarget
+target5.type=UnitTestTargetJunit4
 target5.width=80
-target5.x=190
-target5.y=110
+target5.x=160
+target5.y=190
+target6.height=50
+target6.name=Student
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=80
+target6.x=260
+target6.y=220
+target7.height=50
+target7.name=Person
+target7.showInterface=false
+target7.type=AbstractTarget
+target7.width=80
+target7.x=190
+target7.y=110