This is the mail archive of the
mauve-patches@sources.redhat.com
mailing list for the Mauve project.
java.awt.geom.Ellipse2D
- From: David Gilbert <david dot gilbert at object-refinery dot com>
- To: mauve-patches at sources dot redhat dot com
- Date: Wed, 20 Oct 2004 10:59:05 +0100
- Subject: java.awt.geom.Ellipse2D
I've committed the following patch (see attached):
2004-10-20 David Gilbert <david.gilbert@object-refinery.com>
* gnu/testlet/java/awt/geom/Ellipse2D/contains.java: New test.
* gnu/testlet/java/awt/geom/Ellipse2D/intersects.java: Likewise.
All checks pass for me using JamVM 1.2.0 and a recent CVS version of
Classpath.
Regards,
Dave Gilbert
http://www.jfree.org
Index: ChangeLog
===================================================================
RCS file: /cvs/mauve/mauve/ChangeLog,v
retrieving revision 1.701
diff -u -r1.701 ChangeLog
--- ChangeLog 20 Oct 2004 09:11:29 -0000 1.701
+++ ChangeLog 20 Oct 2004 09:29:20 -0000
@@ -1,5 +1,10 @@
2004-10-20 David Gilbert <david.gilbert@object-refinery.com>
+ * gnu/testlet/java/awt/geom/Ellipse2D/contains.java: New test.
+ * gnu/testlet/java/awt/geom/Ellipse2D/intersects.java: Likewise.
+
+2004-10-20 David Gilbert <david.gilbert@object-refinery.com>
+
* gnu/testlet/java/awt/Point/clone.java: New test.
* gnu/testlet/java/awt/Point/constructors.java: Likewise.
* gnu/testlet/java/awt/Point/equals.java: Likewise.
Index: gnu/testlet/java/awt/geom/Ellipse2D/contains.java
===================================================================
RCS file: gnu/testlet/java/awt/geom/Ellipse2D/contains.java
diff -N gnu/testlet/java/awt/geom/Ellipse2D/contains.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/awt/geom/Ellipse2D/contains.java 20 Oct 2004 09:29:22 -0000
@@ -0,0 +1,77 @@
+// Tags: JDK1.2
+
+// Copyright (C) 2004 David Gilbert <david.gilbert@object-refinery.com>
+
+// Mauve is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// Mauve is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Mauve; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA. */
+
+package gnu.testlet.java.awt.geom.Ellipse2D;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.awt.geom.Ellipse2D;
+
+/**
+ * Some checks for the contains() method of the {@link Ellipse2D} class.
+ */
+public class contains implements Testlet {
+
+ /**
+ * Runs the test using the specified harness.
+ *
+ * @param harness the test harness (<code>null</code> not permitted).
+ */
+ public void test(TestHarness harness)
+ {
+ testContains1(harness);
+ testContains2(harness);
+ }
+
+ private void testContains1(TestHarness harness) {
+ harness.checkPoint("contains(double, double)");
+ Ellipse2D e = new Ellipse2D.Double();
+ harness.check(!e.contains(0.0, 0.0));
+
+ e = new Ellipse2D.Double(1.0, 2.0, 3.0, 4.0);
+ harness.check(!e.contains(1.0, 2.0));
+ harness.check(!e.contains(4.0, 2.0));
+ harness.check(!e.contains(1.0, 6.0));
+ harness.check(!e.contains(4.0, 6.0));
+ harness.check(e.contains(2.5, 4.0));
+
+ e = new Ellipse2D.Double(-1.0, -1.0, 2.0, 2.0);
+ harness.check(e.contains(0.0, 0.0));
+ harness.check(!e.contains(-1.0, 0.0));
+ harness.check(!e.contains(0.0, 1.0));
+ harness.check(!e.contains(0.0, -1.0));
+ harness.check(!e.contains(0.0, 1.0));
+
+ harness.check(e.contains(-0.9, 0.0));
+ harness.check(e.contains(0.0, 0.9));
+ harness.check(e.contains(0.0, -0.9));
+ harness.check(e.contains(0.0, 0.9));
+ }
+
+ private void testContains2(TestHarness harness) {
+ harness.checkPoint("contains(double, double, double, double)");
+ Ellipse2D e = new Ellipse2D.Double();
+ harness.check(!e.contains(0.0, 0.0, 0.0, 0.0));
+ e = new Ellipse2D.Double(1.0, 2.0, 3.0, 4.0);
+ harness.check(!e.contains(1.0, 2.0, 3.0, 4.0));
+ harness.check(e.contains(2.5, 4.0, 1.0, 1.0));
+ }
+
+}
Index: gnu/testlet/java/awt/geom/Ellipse2D/intersects.java
===================================================================
RCS file: gnu/testlet/java/awt/geom/Ellipse2D/intersects.java
diff -N gnu/testlet/java/awt/geom/Ellipse2D/intersects.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/awt/geom/Ellipse2D/intersects.java 20 Oct 2004 09:29:22 -0000
@@ -0,0 +1,49 @@
+// Tags: JDK1.2
+
+// Copyright (C) 2004 David Gilbert <david.gilbert@object-refinery.com>
+
+// Mauve is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// Mauve is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Mauve; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA. */
+
+package gnu.testlet.java.awt.geom.Ellipse2D;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.awt.geom.Ellipse2D;
+
+/**
+ * Some checks for the intersects() method of the {@link Ellipse2D} class.
+ */
+public class intersects implements Testlet {
+
+ /**
+ * Runs the test using the specified harness.
+ *
+ * @param harness the test harness (<code>null</code> not permitted).
+ */
+ public void test(TestHarness harness)
+ {
+ Ellipse2D e = new Ellipse2D.Double();
+ harness.check(!e.intersects(0.0, 0.0, 0.0, 0.0));
+ harness.check(!e.intersects(-1.0, -1.0, 2.0, 2.0));
+
+ e = new Ellipse2D.Double(1.0, 2.0, 3.0, 4.0);
+ harness.check(e.intersects(1.0, 2.0, 3.0, 4.0));
+ harness.check(!e.intersects(0.0, 0.0, 1.0, 1.0));
+ }
+
+}
+