revised section 4 (untested)

6 files changed, 4 insertions, 38 deletions

diff --git a/docs/teaching/exercises/tests/Test.java b/docs/teaching/exercises/tests/Test.java
index 17d8b12e6..d6d3bb4e6 100644
--- a/docs/teaching/exercises/tests/Test.java
+++ b/docs/teaching/exercises/tests/Test.java
@@ -18,6 +18,7 @@ import junit.framework.*;
 
 public class Test extends TestCase {
     public Test(String name) { super(name); }
+    public Test() {}
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(Test.class);
diff --git a/docs/teaching/exercises/tests/Test4a.java b/docs/teaching/exercises/tests/Test4a.java
index 7e8f0f234..f3644765f 100644
--- a/docs/teaching/exercises/tests/Test4a.java
+++ b/docs/teaching/exercises/tests/Test4a.java
@@ -18,21 +18,11 @@ import java.awt.Rectangle;
 import junit.framework.*;
 
 public class Test4a extends Test {
-    Rectangle wholeCanvas =
-        new Rectangle(FigureElement.MIN_VALUE, FigureElement.MIN_VALUE,
-                      FigureElement.MAX_VALUE, FigureElement.MAX_VALUE);
-
-    public Test4a(String name) { super(name); }
-
     public static void main(String[] args) {
         junit.textui.TestRunner.run(Test4a.class);
     }
 
-    public void setUp() {
-        super.setUp();
-    }
-
     public void testGroupBounds() {
-        assertEquals(g.getBounds(), wholeCanvas);
+        assertEquals(g.getBounds(), FigureElement.MAX_BOUNDS);
     }
 }
diff --git a/docs/teaching/exercises/tests/Test4b.java b/docs/teaching/exercises/tests/Test4b.java
index 31bea5209..adc891008 100644
--- a/docs/teaching/exercises/tests/Test4b.java
+++ b/docs/teaching/exercises/tests/Test4b.java
@@ -18,17 +18,10 @@ import java.awt.Rectangle;
 import junit.framework.*;
 
 public class Test4b extends Test {
-
-    public Test4b(String name) { super(name); }
-
     public static void main(String[] args) {
         junit.textui.TestRunner.run(Test4b.class);
     }
 
-    public void setUp() {
-        super.setUp();
-    }
-
     public void testBasicEquality() {
         assertTrue(g.getBounds() == g.getBounds());
     }
@@ -58,12 +51,9 @@ public class Test4b extends Test {
 
     public void testNotWholeCanvas() {
         assertTrue("bounds for this group should not be the whole canvas",
-                   g.getBounds().getWidth() <
-                   (FigureElement.MAX_VALUE - FigureElement.MIN_VALUE));
+            g.getBounds().getWidth() < FigureElement.MAX_BOUNDS.getWidth());
         assertTrue("bounds for this group should not be the whole canvas",
-                   g.getBounds().getHeight() <
-                   (FigureElement.MAX_VALUE - FigureElement.MIN_VALUE));
-
+            g.getBounds().getHeight() < FigureElement.MAX_BOUNDS.getHeight());
     }
 }
 
diff --git a/docs/teaching/exercises/tests/Test4c.java b/docs/teaching/exercises/tests/Test4c.java
index 1f30a9ae3..c4c5928ce 100644
--- a/docs/teaching/exercises/tests/Test4c.java
+++ b/docs/teaching/exercises/tests/Test4c.java
@@ -18,17 +18,10 @@ import java.awt.Rectangle;
 import junit.framework.*;
 
 public class Test4c extends Test {
-
-    public Test4c(String name) { super(name); }
-
     public static void main(String[] args) {
         junit.textui.TestRunner.run(Test4c.class);
     }
 
-    public void setUp() {
-        super.setUp();
-    }
-
     public void testBasicEquality() {
         assertTrue(g.getBounds() == g.getBounds());
     }
diff --git a/docs/teaching/exercises/tests/Test4d.java b/docs/teaching/exercises/tests/Test4d.java
index c1871cfd0..234422235 100644
--- a/docs/teaching/exercises/tests/Test4d.java
+++ b/docs/teaching/exercises/tests/Test4d.java
@@ -25,10 +25,6 @@ public class Test4d extends Test {
         junit.textui.TestRunner.run(Test4d.class);
     }
 
-    public void setUp() {
-        super.setUp();
-    }
-
     public void testBasicEquality() {
         assertTrue(g.getBounds() == g.getBounds());
     }
diff --git a/docs/teaching/exercises/tests/Test4e.java b/docs/teaching/exercises/tests/Test4e.java
index 91710b0ea..3fe4689ee 100644
--- a/docs/teaching/exercises/tests/Test4e.java
+++ b/docs/teaching/exercises/tests/Test4e.java
@@ -25,10 +25,6 @@ public class Test4e extends Test {
         junit.textui.TestRunner.run(Test4e.class);
     }
 
-    public void setUp() {
-        super.setUp();
-    }
-
     public void testBasicEquality() {
         assertTrue(g.getBounds() == g.getBounds());
     }