--- a/tests/libjava-mauve/src/gnu/testlet/javax/management/ObjectName/applyJDK6.java	Fri Jul 20 21:39:51 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// 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);
-		      }
-		  }
-	      }
-	  }
-      }
-  }
-}