* FYI: More ObjectName tests
@ 2007-04-09 21:47 Andrew John Hughes
0 siblings, 0 replies; only message in thread
From: Andrew John Hughes @ 2007-04-09 21:47 UTC (permalink / raw)
To: mauve-patches
[-- Attachment #1.1: Type: text/plain, Size: 480 bytes --]
More parsing of 1.5 names and application of 1.6 queries.
Changelog:
2007-04-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/testlet/javax/management/ObjectName/applyJDK6.java:
Application tests for 1.6.
* gnu/testlet/javax/management/ObjectName/Parsing.java:
More parse tests for 1.5.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
[-- Attachment #1.2: management-05.diff --]
[-- Type: text/x-diff, Size: 15265 bytes --]
Index: gnu/testlet/javax/management/ObjectName/Parsing.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/javax/management/ObjectName/Parsing.java,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 Parsing.java
--- gnu/testlet/javax/management/ObjectName/Parsing.java 7 Apr 2007 11:31:12 -0000 1.1
+++ gnu/testlet/javax/management/ObjectName/Parsing.java 9 Apr 2007 21:39:04 -0000
@@ -31,32 +31,303 @@ public class Parsing implements Testlet
{
public void test(TestHarness h)
{
+ ObjectName name;
try
{
h.checkPoint("Default name");
- ObjectName name = new ObjectName("*:*");
+ name = new ObjectName("*:*");
h.check(true);
+ h.check(name.isDomainPattern(), true);
+ h.check(name.isPropertyPattern(), true);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "*");
+ h.check(name.getKeyPropertyListString(), "");
h.checkPoint("Mixed keys and wildcards");
name =
new ObjectName("jboss.management.local:j2eeType=ServiceModule,*,name=jbossmq-httpil.sar");
h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), true);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "jboss.management.local");
+ h.check(name.getKeyPropertyListString(), "j2eeType=ServiceModule,name=jbossmq-httpil.sar");
h.checkPoint("Match any domain with specific keys");
name = new ObjectName("*:library=Classpath,project=GNU");
h.check(true);
+ h.check(name.isDomainPattern(), true);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "*");
+ h.check(name.getCanonicalKeyPropertyListString(), "library=Classpath,project=GNU");
+ h.check(name.getKeyPropertyListString(), "library=Classpath,project=GNU");
h.checkPoint("Match any domain with specific keys and wildcard at end");
name = new ObjectName("*:library=Classpath,project=GNU,*");
h.check(true);
+ h.check(name.isDomainPattern(), true);
+ h.check(name.isPropertyPattern(), true);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "*");
+ h.check(name.getKeyPropertyListString(), "library=Classpath,project=GNU");
+ h.checkPoint("Match any domain beginning with 'fs' with specific keys");
+ name = new ObjectName("fs?:library=Classpath,project=GNU");
+ h.check(true);
+ h.check(name.isDomainPattern(), true);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "fs?");
+ h.check(name.getKeyPropertyListString(), "library=Classpath,project=GNU");
+ h.checkPoint("Match any domain beginning with 'fs' with specific keys " +
+ "and wildcard at end");
+ name = new ObjectName("fs?:library=Classpath,project=GNU,*");
+ h.check(true);
+ h.check(name.isDomainPattern(), true);
+ h.check(name.isPropertyPattern(), true);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "fs?");
+ h.check(name.getKeyPropertyListString(), "library=Classpath,project=GNU");
h.checkPoint("Match the FSF domain with specific keys and wildcard at end");
name = new ObjectName("fsf:library=Classpath,project=GNU,*");
h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), true);
+ h.check(name.isPattern(), true);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyPropertyListString(), "library=Classpath,project=GNU");
h.checkPoint("Match the FSF domain with specific keys");
name = new ObjectName("fsf:library=Classpath,project=GNU");
h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyPropertyListString(), "library=Classpath,project=GNU");
+ h.checkPoint("Match the FSF domain with specific keys and quoted values");
+ name = new ObjectName("fsf:library=\"Classpath\",project=GNU");
+ h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyProperty("library"), "\"Classpath\"");
+ h.check(name.getKeyPropertyListString(), "library=\"Classpath\",project=GNU");
+ h.checkPoint("Match the FSF domain with specific keys and quoted values with "+
+ "escaped quote");
+ name = new ObjectName("fsf:library=\"Class\\\"path\",project=GNU");
+ h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyProperty("library"), "\"Class\\\"path\"");
+ h.check(name.getKeyPropertyListString(), "library=\"Class\\\"path\",project=GNU");
+ h.checkPoint("Match the FSF domain with specific keys and quoted values with "+
+ "escaped newline");
+ name = new ObjectName("fsf:library=\"Class\\npath\",project=GNU");
+ h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyProperty("library"), "\"Class\\npath\"");
+ h.check(name.getKeyPropertyListString(), "library=\"Class\\npath\",project=GNU");
+ h.checkPoint("Match the FSF domain with specific keys and quoted values with "+
+ "escaped backslash");
+ name = new ObjectName("fsf:library=\"Class\\\\path\",project=GNU");
+ h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyProperty("library"), "\"Class\\\\path\"");
+ h.check(name.getKeyPropertyListString(), "library=\"Class\\\\path\",project=GNU");
+ h.checkPoint("Match the FSF domain with space preservation");
+ name = new ObjectName("fsf: library = Classpath ");
+ h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getKeyProperty(" library "), " Classpath ");
+ h.check(name.getKeyPropertyListString(), " library = Classpath ");
+ h.checkPoint("Key ordering");
+ name = new ObjectName("fsf:project=GNU,library=Classpath");
+ h.check(true);
+ h.check(name.isDomainPattern(), false);
+ h.check(name.isPropertyPattern(), false);
+ h.check(name.isPattern(), false);
+ h.check(name.getDomain(), "fsf");
+ h.check(name.getCanonicalKeyPropertyListString(), "library=Classpath,project=GNU");
+ h.check(name.getKeyPropertyListString(), "project=GNU,library=Classpath");
}
catch (MalformedObjectNameException e)
{
h.debug(e);
+ h.check(false);
+ }
+ try
+ {
+ name = new ObjectName("fsf:lib,rary=Classpath,project=GNU");
+ h.fail("Comma allowed in key name");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Comma in key name caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:lib=rary=Classpath,project=GNU");
+ h.fail("Equals allowed in key name");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Equals in key name caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:lib:rary=Classpath,project=GNU");
+ h.fail("Colon allowed in key name");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Colon in key name caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:lib*rary=Classpath,project=GNU");
+ h.fail("Asterisk allowed in key name");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Asterisk in key name caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:lib?rary=Classpath,project=GNU");
+ h.fail("Question mark allowed in key name");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Question mark in key name caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=Classpath,library=Sun,project=GNU");
+ h.fail("Duplicate key allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Duplicate key caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=Clas,path,project=GNU");
+ h.fail("Comma allowed in unquoted value");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Comma in unquoted value caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=Clas=path,project=GNU");
+ h.fail("Equals allowed in unquoted value");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Equals in unquoted value caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=Clas:path,project=GNU");
+ h.fail("Colon allowed in unquoted value");
}
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Colon in unquoted value caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=Clas\"path,project=GNU");
+ h.fail("Quote allowed in unquoted value");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Quote in unquoted value caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=\"Classpath,project=GNU");
+ h.fail("Unclosed quotes allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Unclosed quotes caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=\"Class\"path\",project=GNU");
+ h.debug(name.getKeyProperty("library"));
+ h.fail("Unescaped quote allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Unescaped quote caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:");
+ h.fail("Non-pattern with no keys allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Non-pattern with no keys caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:*,*");
+ h.fail("Pattern with multiple asterisks in properties allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Pattern with multiple asterisks in properties caught");
+ }
+ try
+ {
+ name = new ObjectName("f\nsf:library=Classpath");
+ h.fail("Domain with newline allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Domain with newline caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:lib\nrary=Classpath");
+ h.fail("Key with newline allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Key with newline caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=Class\npath");
+ h.fail("Unquoted value with newline allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Unquoted value with newline caught");
+ }
+ try
+ {
+ name = new ObjectName("fsf:library=\"Class\npath\"");
+ h.fail("Quoted value with newline allowed");
+ }
+ catch (MalformedObjectNameException e)
+ {
+ h.check(true, "Quoted value with newline caught");
+ }
+
}
}
Index: gnu/testlet/javax/management/ObjectName/applyJDK6.java
===================================================================
RCS file: gnu/testlet/javax/management/ObjectName/applyJDK6.java
diff -N gnu/testlet/javax/management/ObjectName/applyJDK6.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/javax/management/ObjectName/applyJDK6.java 9 Apr 2007 21:39:04 -0000
@@ -0,0 +1,106 @@
+// Copyright (C) 2007 Red Hat, Inc.
+// Written by Gary Benson <gbenson@redhat.com>
+// Adapted for additional JDK6 tests.
+// Copyright (C) 2007 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+// This file is part of Mauve.
+
+// 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.
+
+// Tags: JDK1.6
+
+package gnu.testlet.javax.management.ObjectName;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import gnu.testlet.Testlet;
+import gnu.testlet.TestHarness;
+
+public class applyJDK6 implements Testlet
+{
+ private String[] domains = new String[] {
+ "mauve", "m?uve", "*ve", "*au*", "m?*e", "mauv?", "m*v*", "*"};
+
+ private boolean domainMatches(String a, String b)
+ {
+ // XXX This is very hacky. The spec says that nothing matches
+ // a pattern. And all the patterns here match the non-pattern.
+ return !b.contains("?") && !b.contains("*");
+ }
+
+ private String[] properties = new String[] {
+ "foo=b?r", "foo=b?r,spam=eggs", "spam=eggs,foo=b?r", "foo=b?r,*",
+ "foo=b*", "foo=b*,spam=eggs", "spam=eggs,foo=b*", "foo=b*,*",
+ "foo=\"b?r\"", "foo=\"b?r\",spam=eggs", "spam=eggs,foo=\"b?r\"", "foo=\"b?r\",*",
+ "foo=\"b*\"", "foo=\"b*\",spam=eggs", "spam=eggs,foo=\"b*\"", "foo=\"b*\",*"
+ };
+
+ private boolean propertyMatches(String a, String b)
+ {
+ // Again, nothing matches a pattern.
+ if (b.contains("*") || b.contains("?"))
+ return false;
+ // All the patterns here match the non-patterns.
+ if (a.contains("*") || a.contains("?"))
+ return true;
+ // If they're the same length then they match (XXX hacky)
+ return a.length() == b.length();
+ }
+
+ public void test(TestHarness harness)
+ {
+ for (int ida = 0; ida < domains.length; ida++)
+ {
+ for (int idb = 0; idb < domains.length; idb++)
+ {
+ for (int ipa = 0; ipa < properties.length; ipa++)
+ {
+ for (int ipb = 0; ipb < properties.length; ipb++)
+ {
+ String da = domains[ida];
+ String db = domains[idb];
+ boolean dm = domainMatches(da, db);
+
+ String pa = properties[ipa];
+ String pb = properties[ipb];
+ boolean pm = propertyMatches(pa, pb);
+
+ String sa = da + ":" + pa;
+ String sb = db + ":" + pb;
+ boolean expect = dm && pm;
+
+ try
+ {
+ ObjectName ona = new ObjectName(sa);
+ ObjectName onb = new ObjectName(sb);
+
+ harness.check(ona.apply(onb) == expect,
+ sa + " should" +
+ (expect ? "" : " not") +
+ " match " + sb);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ harness.check(false);
+ harness.debug(e);
+ }
+ }
+ }
+ }
+ }
+ }
+}
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-04-09 21:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-04-09 21:47 FYI: More ObjectName tests Andrew John Hughes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).