Fix tests package-021 and package-022 to include the proper files in <xsl:include>
authorabraaksm
Sun, 23 Dec 2018 00:56:25 +0100
changeset 1943 7759ae3ffc15
parent 1942 f6973ae9b007
child 1944 b31a8b864dac
child 2012 79e448ade23b
Fix tests package-021 and package-022 to include the proper files in <xsl:include>
tests/decl/package/_package-test-set.xml
tests/decl/package/package-021-includeA.xsl
tests/decl/package/package-021-includeB.xsl
tests/decl/package/package-021.xsl
tests/decl/package/package-022-includeA.xsl
tests/decl/package/package-022-includeC.xsl
tests/decl/package/package-022.xsl
--- a/tests/decl/package/_package-test-set.xml	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/_package-test-set.xml	Sun Dec 23 00:56:25 2018 +0100
@@ -365,6 +365,7 @@
    <test-case name="package-021">
       <description>Using xsl:include 3 levels deep and using xsl:use-package twice with the same declaration, follow-up on bug 29453</description>
       <created by="Abel Braaksma" on="2016-05-26"/>
+      <modified by="Abel Braaksma" on="2018-12-23" change="Fix, test included **-020.xsl files instead of **-021.xsl and therefore tested the wrong assumptions"/>
       <environment>
          <source file="package-000.xml" uri="package-000.xml" role="."/>
       </environment>
@@ -384,6 +385,7 @@
       <description>Using xsl:include 3 levels deep and using xsl:use-package twice with the different declaration (public follows hidden), follow-up on bug 29453 and 29667</description>
       <created by="Abel Braaksma" on="2016-05-26"/>
       <modified by="Abel Braaksma" on="2016-06-03" change="Added different visibilities in package-022-includeC.xsl per Bug 29667"/>
+      <modified by="Abel Braaksma" on="2018-12-23" change="Fix, test included **-020.xsl files instead of **-022.xsl and therefore tested the wrong assumptions"/>
       <environment>
          <source file="package-000.xml" uri="package-000.xml" role="."/>
       </environment>
--- a/tests/decl/package/package-021-includeA.xsl	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/package-021-includeA.xsl	Sun Dec 23 00:56:25 2018 +0100
@@ -4,6 +4,6 @@
     xmlns:pkg="urn:use-me"
     version="3.0">
     
-    <xsl:include href="package-020-includeB.xsl"/>
+    <xsl:include href="package-021-includeB.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
--- a/tests/decl/package/package-021-includeB.xsl	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/package-021-includeB.xsl	Sun Dec 23 00:56:25 2018 +0100
@@ -10,6 +10,6 @@
     </xsl:use-package>
 
     <!-- cause two xsl:use-package on the same stylesheet level, this is allowed -->
-    <xsl:include href="package-020-includeC.xsl"/>
+    <xsl:include href="package-021-includeC.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
--- a/tests/decl/package/package-021.xsl	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/package-021.xsl	Sun Dec 23 00:56:25 2018 +0100
@@ -8,7 +8,7 @@
     <xsl:mode on-no-match="text-only-copy" />
     
     <!-- testing using a pkg through an include -->    
-    <xsl:include href="package-020-includeA.xsl"/>
+    <xsl:include href="package-021-includeA.xsl"/>
     
     <!-- an (almost) empty package -->
     
--- a/tests/decl/package/package-022-includeA.xsl	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/package-022-includeA.xsl	Sun Dec 23 00:56:25 2018 +0100
@@ -4,6 +4,6 @@
     xmlns:pkg="urn:use-me"
     version="3.0">
     
-    <xsl:include href="package-020-includeB.xsl"/>
+    <xsl:include href="package-022-includeB.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
--- a/tests/decl/package/package-022-includeC.xsl	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/package-022-includeC.xsl	Sun Dec 23 00:56:25 2018 +0100
@@ -4,7 +4,9 @@
     xmlns:pkg="urn:use-me"
     version="3.0">
     
-    <!-- hidden in the previous xsl:include, public in this one -->    
+    <!-- two xsl:use-package with the same package, are considered two different packages with the same content
+        to resolve a conflict, overlapping declarations can be hidden in one use-package and accepted in the other -->
+    
     <xsl:use-package name="urn:use-me" package-version="*"  >
         <xsl:accept component="function" names="pkg:function1" visibility="hidden" />
     </xsl:use-package>
--- a/tests/decl/package/package-022.xsl	Sat Dec 22 23:49:44 2018 +0100
+++ b/tests/decl/package/package-022.xsl	Sun Dec 23 00:56:25 2018 +0100
@@ -8,7 +8,7 @@
     <xsl:mode on-no-match="text-only-copy" />
     
     <!-- testing using a pkg through an include -->    
-    <xsl:include href="package-020-includeA.xsl"/>
+    <xsl:include href="package-022-includeA.xsl"/>
     
     <!-- an (almost) empty package -->