remove test added in error

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1918536 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 24, 2024 · 65afdab · 65afdab
1 parent a3864e9
commit 65afdab
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 50 deletions.
diff --git a/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
@@ -54,7 +54,7 @@ public static String pretty(XMLName name)
         if (name == null)
             return "null";
 
-        if (name.getNamespaceUri() == null || name.getNamespaceUri().isEmpty())
+        if (name.getNamespaceUri() == null || name.getNamespaceURI().isEmpty())
             return name.getLocalName();
 
         return name.getLocalName() + "@" + name.getNamespaceUri();
@@ -109,7 +109,7 @@ public static String hexsafe(String s)
 
     public static String hexsafedir(XMLName name)
     {
-        if (name.getNamespaceUri() == null || name.getNamespaceUri().isEmpty())
+        if (name.getNamespaceUri() == null || name.getNamespaceURI().isEmpty())
             return "_nons/" + hexsafe(name.getLocalName());
         return hexsafe(name.getNamespaceUri()) + "/" + hexsafe(name.getLocalName());
     }

diff --git a/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
@@ -177,7 +177,7 @@ protected void fillUpLocalElement(Element element, org.apache.xmlbeans.impl.xb.x
         if (!element.isRef())
         {
             assert element.getName().getNamespaceURI().equals(tns) ||
-                element.getName().getNamespaceUri().isEmpty();
+                element.getName().getNamespaceURI().isEmpty();
             fillUpTypeOnElement(element.getType(), localSElement, tns);
             localSElement.setName(element.getName().getLocalPart());
         }

diff --git a/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
@@ -539,7 +539,7 @@ public int getRecovered() {
      */
     private QName compatName(QName name, String chameleonNamespace) {
         // first check for a chameleonNamespace namespace
-        if (name.getNamespaceUri().isEmpty() && chameleonNamespace != null && chameleonNamespace.length() > 0) {
+        if (name.getNamespaceURI().isEmpty() && chameleonNamespace != null && chameleonNamespace.length() > 0) {
             name = new QName(chameleonNamespace, name.getLocalPart());
         }
 

diff --git a/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
@@ -1387,7 +1387,7 @@ static SchemaLocalAttributeImpl translateAttribute(
                 state.error(XmlErrorCodes.NO_XSI, new Object[]{"http://www.w3.org/2001/XMLSchema-instance"}, xsdAttr.xgetName());
             }
 
-            if (qname.getNamespaceUri().isEmpty() && qname.getLocalPart().equals("xmlns")) {
+            if (qname.getNamespaceURI().isEmpty() && qname.getLocalPart().equals("xmlns")) {
                 state.error(XmlErrorCodes.NO_XMLNS, null, xsdAttr.xgetName());
             }
 

diff --git a/src/main/java/org/apache/xmlbeans/impl/store/Saver.java b/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
@@ -394,7 +394,7 @@ private void processElement() {
         // which has no namespace, then we must make sure that pushing
         // the mappings causes the default namespace to be empty
 
-        boolean ensureDefaultEmpty = name.getNamespaceUri().isEmpty();
+        boolean ensureDefaultEmpty = name.getNamespaceURI().isEmpty();
 
         pushMappings(_cur, ensureDefaultEmpty);
 

diff --git a/src/test/java/compile/scomp/checkin/CompilationTests.java b/src/test/java/compile/scomp/checkin/CompilationTests.java
@@ -313,23 +313,6 @@ void testPricequote() {
         assertTrue(outputjar.exists(), "Cannot find " + outputjar);
     }
 
-    @Test
-    void testScéimreSonraí() {
-        deltree(xbeanOutput("compile/scomp/scéimresonraí"));
-        // First, compile schema
-        File srcdir = xbeanOutput("compile/scomp/scéimresonraí/src");
-        File classesdir = xbeanOutput("compile/scomp/scéimresonraí/classes");
-        File outputjar = xbeanOutput("compile/scomp/scéimresonraí/scéimresonraí.jar");
-        Parameters params = new Parameters();
-        params.setXsdFiles(xbeanCase("ScéimreSonraí/scéimresonraí.xsd"));
-        params.setSrcDir(srcdir);
-        params.setClassesDir(classesdir);
-        params.setOutputJar(outputjar);
-        params.setVerbose(true);
-        assertTrue(SchemaCompiler.compile(params), "Build failed " + fwroot);
-        assertTrue(outputjar.exists(), "Cannot find " + outputjar);
-    }
-
     @Test
     void testBase64Binary() {
         deltree(xbeanOutput("compile/scomp/base64Binary"));

diff --git a/src/test/resources/xbean/compile/scomp/ScéimreSonraí/scéimresonraí.xsd b/src/test/resources/xbean/compile/scomp/ScéimreSonraí/scéimresonraí.xsd