jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1497808 - in /jackrabbit/trunk/jackrabbit-core/src/test: java/org/apache/jackrabbit/core/nodetype/xml/ resources/org/apache/jackrabbit/core/nodetype/xml/
Date Fri, 28 Jun 2013 15:16:57 GMT
Author: reschke
Date: Fri Jun 28 15:16:57 2013
New Revision: 1497808

URL: http://svn.apache.org/r1497808
Log:
JCR-3616: unit tests should use valid namespace names

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_cnd_nodetypes.cnd
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java?rev=1497808&r1=1497807&r2=1497808&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
Fri Jun 28 15:16:57 2013
@@ -248,7 +248,7 @@ public class TestAll extends AbstractJCR
     /** Test for namespace registration on node type import. */
     public void testImportXMLNodeTypes() throws Exception {
         try {
-            superuser.getNamespacePrefix("test-namespace2");
+            superuser.getNamespacePrefix("http://ns.example.org/test-namespace2");
             // Ignore test case, node type and namespace already registered
         } catch (NamespaceException e1) {
             // Namespace testns2 not yet registered
@@ -258,7 +258,7 @@ public class TestAll extends AbstractJCR
                     TestAll.class.getResourceAsStream(TEST_NS_XML_NODETYPES),
                     JackrabbitNodeTypeManager.TEXT_XML);
             try {
-                superuser.getNamespacePrefix("test-namespace2");
+                superuser.getNamespacePrefix("http://ns.example.org/test-namespace2");
             } catch (NamespaceException e2) {
                 fail("xml test2 namespace not registered");
             }
@@ -286,14 +286,14 @@ public class TestAll extends AbstractJCR
     /** Test for namespace registration on node type import. */
     public void testImportCNDNodeTypes() throws Exception {
         try {
-            superuser.getNamespacePrefix("test-namespace3");
+            superuser.getNamespacePrefix("http://ns.example.org/test-namespace3");
             // Ignore test case, node type and namespace already registered
         } catch (NamespaceException e1) {
             Reader cnd = new InputStreamReader(TestAll.class.getResourceAsStream(TEST_NS_CND_NODETYPES));
             CndImporter.registerNodeTypes(cnd, superuser);
             cnd.close();
             try {
-                superuser.getNamespacePrefix("test-namespace3");
+                superuser.getNamespacePrefix("http://ns.example.org/test-namespace3");
             } catch (NamespaceException e2) {
                 fail("cnd test3 namespace not registered");
             }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd?rev=1497808&r1=1497807&r2=1497808&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
Fri Jun 28 15:16:57 2013
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-<testns3 = "test-namespace3">
-<testns4 = "test-namespace4">
+<testns3 = "http://ns.example.org/test-namespace3">
+<testns4 = "http://ns.example.org/test-namespace4">
 
 [testns3:emptyNodeType] > nt:base 
 

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml?rev=1497808&r1=1497807&r2=1497808&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
Fri Jun 28 15:16:57 2013
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
  -->
-<nodeTypes xmlns:testns1="test-namespace1"
-           xmlns:testns2="test-namespace2"
+<nodeTypes xmlns:testns1="http://ns.example.org/test-namespace1"
+           xmlns:testns2="http://ns.example.org/test-namespace2"
            xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
 
   <nodeType name="testns2:emptyNodeType"

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_cnd_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_cnd_nodetypes.cnd?rev=1497808&r1=1497807&r2=1497808&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_cnd_nodetypes.cnd
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_cnd_nodetypes.cnd
Fri Jun 28 15:16:57 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-<testns6 = "test-namespace6">
+<testns6 = "http://ns.example.org/test-namespace6">
 
 [testns6:sameNodeType] > nt:base
 

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml?rev=1497808&r1=1497807&r2=1497808&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml
Fri Jun 28 15:16:57 2013
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
  -->
-<nodeTypes xmlns:testns5="test-namespace5"
+<nodeTypes xmlns:testns5="http://ns.example.org/test-namespace5"
            xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
 
   <nodeType name="testns5:sameNodeType"



Mime
View raw message