Skip to content

Commit 3fc10ae

Browse files
rhubnerrhubner
committed
[feature] Lazy loading modules - fix tests.
1 parent 4b5986d commit 3fc10ae

16 files changed

+136
-65
lines changed

‎exist-core/src/test/java/org/exist/validation/CollectionConfigurationValidationModeTest.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,18 @@ public class CollectionConfigurationValidationModeTest {
5555

5656
@AfterClass
5757
public static void tearDownClass() throws Exception {
58-
existEmbeddedServer.executeQuery("validation:clear-grammar-cache()");
58+
existEmbeddedServer.executeQuery(
59+
"import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
60+
"validation:clear-grammar-cache()"
61+
);
5962
}
6063

6164
@Before
6265
public void setUp() throws Exception {
63-
existEmbeddedServer.executeQuery("validation:clear-grammar-cache()");
66+
existEmbeddedServer.executeQuery(
67+
"import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
68+
"validation:clear-grammar-cache()"
69+
);
6470
}
6571

6672
private void createCollection(final String collection) throws XMLDBException {

‎exist-core/src/test/java/org/exist/xquery/ForwardReferenceTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ public void test1() throws EXistException, PermissionDeniedException, IOExceptio
141141
"\n" +
142142
"import module namespace xqsuite = \"http://exist-db.org/xquery/xqsuite\"\n" +
143143
" at \"resource:org/exist/xquery/lib/xqsuite/xqsuite.xql\";\n" +
144+
"import module namespace inspect = \"http://exist-db.org/xquery/inspection\";" +
144145
"\n" +
145146
"xqsuite:suite((\n" +
146147
" inspect:module-functions(xs:anyURI(\"xmldb:exist://" + TEST_PAGES_MODULE_URI + "\"))\n" +

‎exist-core/src/test/java/org/exist/xquery/XQueryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ public void namespaceWithTransform() throws XMLDBException {
935935

936936
String query =
937937
"xquery version \"1.0\";\n" +
938-
"declare namespace transform=\"http://exist-db.org/xquery/transform\";\n" +
938+
"import module namespace transform=\"http://exist-db.org/xquery/transform\";\n" +
939939
"declare variable $xml {\n" +
940940
" <node>text</node>\n" +
941941
"};\n" +

‎exist-core/src/test/java/org/exist/xquery/functions/transform/TransformTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public class TransformTest {
132132
"xquery version \"3.0\";\n" +
133133
"\n" +
134134
"(:Read document with xsl:for-each and look for key in the dictionary document :)\n" +
135+
"import module namespace transform = \"http://exist-db.org/xquery/transform\";\n" +
135136
"declare variable $xsltPath as xs:string := '" + TEST_IDS_COLLECTION.getCollectionPath() + "';\n" +
136137
"declare variable $listOpsFileUri as xs:string := '" + TEST_IDS_COLLECTION.getCollectionPath()+ "/listOpsErr.xml';\n" +
137138
"declare variable $inputFileUri as xs:string := '" + TEST_IDS_COLLECTION.getCollectionPath() + "/inputListOps.xml';\n" +

‎exist-core/src/test/java/org/exist/xquery/functions/validate/AdditionalJingXsdRngTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public class AdditionalJingXsdRngTest {
4343

4444
@Test
4545
public void testValidateXSDwithJing() throws XMLDBException {
46-
final String query = "let $v := <doc>\n" +
46+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
47+
"let $v := <doc>\n" +
4748
"\t<title>Title</title>\n" +
4849
"\t<p>Some paragraph.</p>\n" +
4950
" </doc>\n" +
@@ -71,7 +72,8 @@ public void testValidateXSDwithJing() throws XMLDBException {
7172

7273
@Test
7374
public void testValidateXSDwithJing_invalid() throws XMLDBException {
74-
final String query = "let $v := <doc>\n" +
75+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
76+
"let $v := <doc>\n" +
7577
"\t<title1>Title</title1>\n" +
7678
"\t<p>Some paragraph.</p>\n" +
7779
" </doc>\n" +
@@ -99,7 +101,8 @@ public void testValidateXSDwithJing_invalid() throws XMLDBException {
99101

100102
@Test
101103
public void testValidateRNGwithJing() throws XPathException, XMLDBException {
102-
final String query = "let $v := <doc>\n" +
104+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
105+
"let $v := <doc>\n" +
103106
"\t<title>Title</title>\n" +
104107
"\t<p>Some paragraph.</p>\n" +
105108
" </doc>\n" +
@@ -139,7 +142,8 @@ public void testValidateRNGwithJing() throws XPathException, XMLDBException {
139142

140143
@Test
141144
public void testValidateRNGwithJing_invalid() throws XMLDBException {
142-
final String query = "let $v := <doc>\n" +
145+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
146+
"let $v := <doc>\n" +
143147
"\t<title1>Title</title1>\n" +
144148
"\t<p>Some paragraph.</p>\n" +
145149
" </doc>\n" +

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxpDtdCatalogTest.java‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ public static void prepareResources() throws Exception {
118118

119119
@Before
120120
public void clearGrammarCache() throws XMLDBException {
121-
final ResourceSet results = existEmbeddedServer.executeQuery("validation:clear-grammar-cache()");
121+
final ResourceSet results = existEmbeddedServer.executeQuery(
122+
"import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
123+
"validation:clear-grammar-cache()");
122124
results.getResource(0).getContent();
123125
}
124126

@@ -127,31 +129,35 @@ public void clearGrammarCache() throws XMLDBException {
127129
*/
128130
@Test
129131
public void dtd_stored_catalog_valid() throws XMLDBException, SAXException, XpathException, IOException {
130-
final String query = "validation:jaxp-report( " +
132+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
133+
"validation:jaxp-report( " +
131134
"xs:anyURI('/db/parse/instance/valid-dtd.xml'), false()," +
132135
"doc('/db/parse/catalog.xml') )";
133136
executeAndEvaluate(query,"valid");
134137
}
135138

136139
@Test
137140
public void dtd_stored_catalog_invalid() throws XMLDBException, SAXException, XpathException, IOException {
138-
final String query = "validation:jaxp-report( " +
141+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
142+
"validation:jaxp-report( " +
139143
"xs:anyURI('/db/parse/instance/invalid-dtd.xml'), false()," +
140144
"doc('/db/parse/catalog.xml') )";
141145
executeAndEvaluate(query,"invalid");
142146
}
143147

144148
@Test
145149
public void dtd_anyURI_catalog_valid() throws XMLDBException, SAXException, XpathException, IOException {
146-
final String query = "validation:jaxp-report( " +
150+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
151+
"validation:jaxp-report( " +
147152
"xs:anyURI('/db/parse/instance/valid-dtd.xml'), false()," +
148153
"xs:anyURI('/db/parse/catalog.xml') )";
149154
executeAndEvaluate(query,"valid");
150155
}
151156

152157
@Test
153158
public void dtd_anyURI_catalog_invalid() throws XMLDBException, SAXException, XpathException, IOException {
154-
final String query = "validation:jaxp-report( " +
159+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
160+
"validation:jaxp-report( " +
155161
"xs:anyURI('/db/parse/instance/invalid-dtd.xml'), false()," +
156162
"xs:anyURI('/db/parse/catalog.xml') )";
157163
executeAndEvaluate(query,"invalid");
@@ -165,15 +171,17 @@ public void dtd_anyURI_catalog_invalid() throws XMLDBException, SAXException, Xp
165171
*/
166172
@Test
167173
public void dtd_searched_valid() throws XMLDBException, SAXException, XpathException, IOException {
168-
final String query = "validation:jaxp-report( " +
174+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
175+
"validation:jaxp-report( " +
169176
"xs:anyURI('/db/parse/instance/valid-dtd.xml'), false()," +
170177
"xs:anyURI('/db/parse/') )";
171178
executeAndEvaluate(query,"valid");
172179
}
173180

174181
@Test
175182
public void dtd_searched_invalid() throws XMLDBException, SAXException, XpathException, IOException {
176-
final String query = "validation:jaxp-report( " +
183+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
184+
"validation:jaxp-report( " +
177185
"xs:anyURI('/db/parse/instance/invalid-dtd.xml'), false()," +
178186
"xs:anyURI('/db/parse/') )";
179187
executeAndEvaluate(query,"invalid");

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxpParseTest.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,21 @@ public static void prepareResources() throws Exception {
9090

9191
@Before
9292
public void clearGrammarCache() throws XMLDBException {
93-
final ResourceSet results = existEmbeddedServer.executeQuery("validation:clear-grammar-cache()");
93+
final ResourceSet results = existEmbeddedServer.executeQuery(
94+
"import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
95+
"validation:clear-grammar-cache()");
9496
results.getResource(0).getContent();
9597
}
9698

9799
@Test
98100
public void parse_and_fill_defaults() throws XMLDBException, IOException, SAXException {
99-
String query = "validation:pre-parse-grammar(xs:anyURI('/db/parse_validate/defaultValue.xsd'))";
101+
String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
102+
"validation:pre-parse-grammar(xs:anyURI('/db/parse_validate/defaultValue.xsd'))";
100103
String result = execute(query);
101104
assertEquals(result, "defaultTest");
102105

103-
query = "declare option exist:serialize 'indent=no'; " +
106+
query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
107+
"declare option exist:serialize 'indent=no'; " +
104108
"validation:jaxp-parse(xs:anyURI('/db/parse_validate/defaultValue.xml'), true(), ())";
105109
result = execute(query);
106110

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxpXsdCatalogTest.java‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,53 +124,61 @@ public static void prepareResources() throws XMLDBException, IOException, URISyn
124124

125125
@Before
126126
public void clearGrammarCache() throws XMLDBException {
127-
final ResourceSet results = existEmbeddedServer.executeQuery("validation:clear-grammar-cache()");
127+
final ResourceSet results = existEmbeddedServer.executeQuery(
128+
"import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
129+
"validation:clear-grammar-cache()");
128130
results.getResource(0).getContent();
129131
}
130132

131133
@Test
132134
public void xsd_stored_catalog_valid() throws XMLDBException, SAXException, XpathException, IOException {
133-
final String query = "validation:jaxp-report( " +
135+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
136+
"validation:jaxp-report( " +
134137
"doc('/db/parse/instance/valid.xml'), false()," +
135138
"doc('/db/parse/catalog.xml') )";
136139
executeAndEvaluate(query,"valid");
137140
}
138141

139142
@Test
140143
public void xsd_stored_catalog_invalid() throws XMLDBException, SAXException, XpathException, IOException {
141-
final String query = "validation:jaxp-report( " +
144+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
145+
"validation:jaxp-report( " +
142146
"doc('/db/parse/instance/invalid.xml'), false()," +
143147
"doc('/db/parse/catalog.xml') )";
144148
executeAndEvaluate(query,"invalid");
145149
}
146150

147151
@Test
148152
public void xsd_anyURI_catalog_valid() throws XMLDBException, SAXException, XpathException, IOException {
149-
final String query = "validation:jaxp-report( " +
153+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
154+
"validation:jaxp-report( " +
150155
"xs:anyURI('/db/parse/instance/valid.xml'), false()," +
151156
"xs:anyURI('/db/parse/catalog.xml') )";
152157
executeAndEvaluate(query,"valid");
153158
}
154159

155160
@Test
156161
public void xsd_anyURI_catalog_invalid() throws XMLDBException, SAXException, XpathException, IOException {
157-
final String query = "validation:jaxp-report( " +
162+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
163+
"validation:jaxp-report( " +
158164
"xs:anyURI('/db/parse/instance/invalid.xml'), false()," +
159165
"xs:anyURI('/db/parse/catalog.xml') )";
160166
executeAndEvaluate(query,"invalid");
161167
}
162168

163169
@Test
164170
public void xsd_searched_valid() throws XMLDBException, SAXException, XpathException, IOException {
165-
final String query = "validation:jaxp-report( " +
171+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
172+
"validation:jaxp-report( " +
166173
"doc('/db/parse/instance/valid.xml'), false()," +
167174
"xs:anyURI('/db/parse/') )";
168175
executeAndEvaluate(query,"valid");
169176
}
170177

171178
@Test
172179
public void xsd_searched_invalid() throws XMLDBException, SAXException, XpathException, IOException {
173-
final String query = "validation:jaxp-report( " +
180+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
181+
"validation:jaxp-report( " +
174182
"doc('/db/parse/instance/invalid.xml'), false()," +
175183
"xs:anyURI('/db/parse/') )";
176184
executeAndEvaluate(query,"invalid");
@@ -179,7 +187,8 @@ public void xsd_searched_invalid() throws XMLDBException, SAXException, XpathExc
179187
// test boolean function
180188
@Test
181189
public void xsd_searched_valid_boolean() throws XMLDBException {
182-
final String query = "validation:jaxp( " +
190+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
191+
"validation:jaxp( " +
183192
"doc('/db/parse/instance/valid.xml'), false()," +
184193
"xs:anyURI('/db/parse/') )";
185194
assertEquals("true", existEmbeddedServer.executeOneValue(query));
@@ -188,7 +197,8 @@ public void xsd_searched_valid_boolean() throws XMLDBException {
188197
// test boolean function
189198
@Test
190199
public void xsd_searched_invalid_boolean() throws XMLDBException {
191-
final String query = "validation:jaxp( " +
200+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
201+
"validation:jaxp( " +
192202
"doc('/db/parse/instance/invalid.xml'), false()," +
193203
"xs:anyURI('/db/parse/') )";
194204
assertEquals("false", existEmbeddedServer.executeOneValue(query));
@@ -197,7 +207,8 @@ public void xsd_searched_invalid_boolean() throws XMLDBException {
197207
// test parse function
198208
@Test
199209
public void xsd_searched_parse_valid() throws SAXException, IOException, XpathException, XMLDBException {
200-
final String query = "validation:jaxp-parse( " +
210+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
211+
"validation:jaxp-parse( " +
201212
"doc('/db/parse/instance/valid.xml'), false()," +
202213
"xs:anyURI('/db/parse/') )";
203214
final String r = existEmbeddedServer.executeOneValue(query);
@@ -207,7 +218,8 @@ public void xsd_searched_parse_valid() throws SAXException, IOException, XpathEx
207218
// test parse function
208219
@Test
209220
public void xsd_searched_parse_invalid() throws SAXException, IOException, XpathException, XMLDBException {
210-
final String query = "validation:jaxp-parse( " +
221+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
222+
"validation:jaxp-parse( " +
211223
"doc('/db/parse/instance/invalid.xml'), false()," +
212224
"xs:anyURI('/db/parse/') )";
213225
final String r = existEmbeddedServer.executeOneValue(query);

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxvTest.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public static void prepareResources() throws Exception {
8989

9090
@Test
9191
public void xsd_stored_valid() throws XMLDBException {
92-
final String query = "validation:jaxv( " +
92+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
93+
"validation:jaxv( " +
9394
"doc('/db/personal/personal-valid.xml'), " +
9495
"doc('/db/personal/personal.xsd') )";
9596

@@ -101,7 +102,8 @@ public void xsd_stored_valid() throws XMLDBException {
101102

102103
@Test
103104
public void xsd_stored_report_valid() throws XMLDBException, SAXException, IOException, XpathException {
104-
final String query = "validation:jaxv-report( " +
105+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
106+
"validation:jaxv-report( " +
105107
"doc('/db/personal/personal-valid.xml'), " +
106108
"doc('/db/personal/personal.xsd') )";
107109

@@ -114,7 +116,8 @@ public void xsd_stored_report_valid() throws XMLDBException, SAXException, IOExc
114116

115117
@Test
116118
public void xsd_stored_invalid() throws XMLDBException, SAXException, IOException, XpathException {
117-
final String query = "validation:jaxv-report( " +
119+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
120+
"validation:jaxv-report( " +
118121
"doc('/db/personal/personal-invalid.xml'), " +
119122
"doc('/db/personal/personal.xsd') )";
120123

@@ -127,7 +130,8 @@ public void xsd_stored_invalid() throws XMLDBException, SAXException, IOExceptio
127130

128131
@Test
129132
public void xsd_anyuri_valid() throws XMLDBException, SAXException, IOException, XpathException {
130-
final String query = "validation:jaxv-report( " +
133+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
134+
"validation:jaxv-report( " +
131135
"xs:anyURI('xmldb:exist:///db/personal/personal-valid.xml'), " +
132136
"xs:anyURI('xmldb:exist:///db/personal/personal.xsd') )";
133137

@@ -140,7 +144,8 @@ public void xsd_anyuri_valid() throws XMLDBException, SAXException, IOException,
140144

141145
@Test
142146
public void xsd_anyuri_invalid() throws XMLDBException, SAXException, IOException, XpathException {
143-
final String query = "validation:jaxv-report( " +
147+
final String query = "import module namespace validation = \"http://exist-db.org/xquery/validation\";\n" +
148+
"validation:jaxv-report( " +
144149
"xs:anyURI('xmldb:exist:///db/personal/personal-invalid.xml'), " +
145150
"xs:anyURI('xmldb:exist:///db/personal/personal.xsd') )";
146151

0 commit comments

Comments
 (0)