From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6377 invoked by alias); 25 Jul 2005 09:44:09 -0000 Mailing-List: contact mauve-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: mauve-patches-owner@sources.redhat.com Received: (qmail 6348 invoked by uid 22791); 25 Jul 2005 09:44:03 -0000 Received: from outmail128163.authsmtp.net (HELO squirrel.dmpriest.net.uk) (62.13.128.163) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Mon, 25 Jul 2005 09:44:03 +0000 Received: from [82.5.12.93] (cpc2-hem14-6-0-cust93.lutn.cable.ntl.com [82.5.12.93]) (authenticated bits=0) by squirrel.dmpriest.net.uk (8.13.3/8.13.3/Kp) with ESMTP id j6P9i16Q004234 for ; Mon, 25 Jul 2005 10:44:01 +0100 (BST) (envelope-from david.gilbert@object-refinery.com) Message-ID: <42E4C273.8040001@object-refinery.com> Date: Mon, 25 Jul 2005 09:44:00 -0000 From: David Gilbert User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050426) MIME-Version: 1.0 To: mauve-patches@sources.redhat.com Subject: FYI: java.awt.image.ConvolveOp new tests Content-Type: multipart/mixed; boundary="------------030704000002090706000300" X-Server-Quench: a1afdf10-fcf0-11d9-a87f-001185d377ca X-Authentic-SMTP: 61633132333134.squirrel.dmpriest.net.uk:1.33/Kp X-Powered-By: AuthSMTP - http://www.authsmtp.com - Authenticated SMTP Mail Relay X-Report-SPAM: If SPAM / abuse - report it at: http://www.authsmtp.com/abuse X-Virus-Status: No virus detected - but ensure you scan with your own anti-virus system! X-SW-Source: 2005/txt/msg00066.txt.bz2 This is a multi-part message in MIME format. --------------030704000002090706000300 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 328 I committed this patch: 2005-07-25 David Gilbert * gnu/testlet/java/awt/image/ConvolveOp/constants.java: new file, * gnu/testlet/java/awt/image/ConvolveOp/constructors.java: new file, * gnu/testlet/java/awt/image/ConvolveOp/getKernel.java: new file. Regards, Dave Gilbert --------------030704000002090706000300 Content-Type: text/plain; name="diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff.txt" Content-length: 7780 Index: gnu/testlet/java/awt/image/ConvolveOp/constants.java =================================================================== RCS file: gnu/testlet/java/awt/image/ConvolveOp/constants.java diff -N gnu/testlet/java/awt/image/ConvolveOp/constants.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/testlet/java/awt/image/ConvolveOp/constants.java 25 Jul 2005 09:39:45 -0000 @@ -0,0 +1,43 @@ +// Tags: JDK1.2 + +// Copyright (C) 2005 David Gilbert + +// 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.image.ConvolveOp; + +import gnu.testlet.TestHarness; +import gnu.testlet.Testlet; + +import java.awt.image.ConvolveOp; + +/** + * Verifies constant values for the {@link ConvolveOp} class. + */ +public class constants implements Testlet { + + /** + * Runs the test using the specified harness. + * + * @param harness the test harness (null not permitted). + */ + public void test(TestHarness harness) + { + harness.check(ConvolveOp.EDGE_NO_OP, 1); + harness.check(ConvolveOp.EDGE_ZERO_FILL, 0); + } + +} Index: gnu/testlet/java/awt/image/ConvolveOp/constructors.java =================================================================== RCS file: gnu/testlet/java/awt/image/ConvolveOp/constructors.java diff -N gnu/testlet/java/awt/image/ConvolveOp/constructors.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/testlet/java/awt/image/ConvolveOp/constructors.java 25 Jul 2005 09:39:45 -0000 @@ -0,0 +1,112 @@ +// Tags: JDK1.2 + +// Copyright (C) 2005 David Gilbert + +// 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.image.ConvolveOp ; + +import gnu.testlet.TestHarness; +import gnu.testlet.Testlet; + +import java.awt.image.ConvolveOp; +import java.awt.image.Kernel; +import java.util.Arrays; + +/** + * Some checks for the constructors in the {@link ConvolveOp} class. + */ +public class constructors implements Testlet +{ + + /** + * Runs the test using the specified harness. + * + * @param harness the test harness (null not permitted). + */ + public void test(TestHarness harness) + { + testConstructor1(harness); + testConstructor2(harness); + } + + public void testConstructor1(TestHarness harness) + { + harness.checkPoint("(Kernel)"); + Kernel k1 = new Kernel(3, 3, new float[] {1f, 2f, 3f, 4f, 5f, 6f, 7f, 8f, 9f}); + ConvolveOp op1 = new ConvolveOp(k1); + harness.check(op1.getKernel() != k1); + harness.check(Arrays.equals(op1.getKernel().getKernelData(null), k1.getKernelData(null))); + harness.check(op1.getEdgeCondition(), ConvolveOp.EDGE_ZERO_FILL); + harness.check(op1.getRenderingHints(), null); + + // using a null Kernel doesn't throw an immediate exception... + boolean pass = true; + try + { + /*ConvolveOp op2 =*/ new ConvolveOp(null); + } + catch (NullPointerException e) + { + pass = false; + } + harness.check(pass); + + // ...but it does later + pass = false; + try + { + ConvolveOp op2 = new ConvolveOp(null); + /*Kernel k2 =*/ op2.getKernel(); + } + catch (NullPointerException e) + { + pass = true; + } + harness.check(pass); + } + + public void testConstructor2(TestHarness harness) + { + harness.checkPoint("(Kernel, int, RenderingHints)"); + Kernel k1 = new Kernel(3, 3, new float[] {1f, 2f, 3f, 4f, 5f, 6f, 7f, 8f, 9f}); + ConvolveOp op1 = new ConvolveOp(k1, ConvolveOp.EDGE_NO_OP, null); + harness.check(op1.getKernel() != k1); + harness.check(Arrays.equals(op1.getKernel().getKernelData(null), k1.getKernelData(null))); + harness.check(op1.getEdgeCondition(), ConvolveOp.EDGE_NO_OP); + harness.check(op1.getRenderingHints(), null); + + // a null kernel will fail when you try to access it + boolean pass = false; + ConvolveOp op2 = new ConvolveOp(null, ConvolveOp.EDGE_NO_OP, null); + try + { + /*Kernel k =*/ op2.getKernel(); + } + catch (NullPointerException e) + { + pass = true; + } + harness.check(pass); + + // try an invalid edge operation code + pass = false; + op1 = new ConvolveOp(k1, -1, null); + harness.check(op1.getEdgeCondition(), -1); + } + +} + Index: gnu/testlet/java/awt/image/ConvolveOp/getKernel.java =================================================================== RCS file: gnu/testlet/java/awt/image/ConvolveOp/getKernel.java diff -N gnu/testlet/java/awt/image/ConvolveOp/getKernel.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/testlet/java/awt/image/ConvolveOp/getKernel.java 25 Jul 2005 09:39:45 -0000 @@ -0,0 +1,54 @@ +// Tags: JDK1.2 + +// Copyright (C) 2005 David Gilbert + +// 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.image.ConvolveOp ; + +import gnu.testlet.TestHarness; +import gnu.testlet.Testlet; + +import java.awt.image.ConvolveOp; +import java.awt.image.Kernel; +import java.util.Arrays; + +/** + * Some checks for the getKernel() method in the {@link ConvolveOp} class. + */ +public class getKernel implements Testlet +{ + + /** + * Runs the test using the specified harness. + * + * @param harness the test harness (null not permitted). + */ + public void test(TestHarness harness) + { + Kernel k1 = new Kernel(1, 1, new float[] {1f}); + ConvolveOp op1 = new ConvolveOp(k1); + Kernel k2 = op1.getKernel(); + harness.check(Arrays.equals(k1.getKernelData(null), k2.getKernelData(null))); + harness.check(k1 != k2); + + // each call seems to clone the kernel + Kernel k3 = op1.getKernel(); + harness.check(k2 != k3); + } + +} + --------------030704000002090706000300--