Skip to content

Commit ce63e02

Browse files
kalxastomkralidis
kalxas
authored and
tomkralidis
committed
[WIP] Fix configuration paths and db paths (#600) (#602)
* Fix configuration paths and db paths (#600) * Fix tester with new path structure (#600) * Update expected test results based on new paths (#600)
1 parent 3332dbb commit ce63e02

File tree

257 files changed

+884
-884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+884
-884
lines changed

‎tests/functionaltests/suites/apiso-inspire/default.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
[server]
3131
home=.
32-
url=http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg
32+
url=http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg
3333
mimetype=application/xml; charset=UTF-8
3434
encoding=UTF-8
3535
language=en-US
@@ -73,7 +73,7 @@ contact_role=pointOfContact
7373

7474
[repository]
7575
# sqlite
76-
database=sqlite:///tests/suites/cite/data/records.db
76+
database=sqlite:///tests/functionaltests/suites/cite/data/cite.db
7777
# postgres
7878
#database=postgres://username:password@localhost/pycsw
7979
table=records

‎tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities-lang.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<!-- PYCSW_VERSION -->
3-
<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" updateSequence="PYCSW_UPDATESEQUENCE" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
3+
<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" version="2.0.2" updateSequence="PYCSW_UPDATESEQUENCE" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
44
<ows:ServiceIdentification>
55
<ows:Title>pycsw Geospatial Catalogue</ows:Title>
66
<ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
@@ -45,8 +45,8 @@
4545
<ows:Operation name="GetCapabilities">
4646
<ows:DCP>
4747
<ows:HTTP>
48-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
49-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
48+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
49+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
5050
</ows:HTTP>
5151
</ows:DCP>
5252
<ows:Parameter name="sections">
@@ -59,8 +59,8 @@
5959
<ows:Operation name="DescribeRecord">
6060
<ows:DCP>
6161
<ows:HTTP>
62-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
63-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
62+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
63+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
6464
</ows:HTTP>
6565
</ows:DCP>
6666
<ows:Parameter name="outputFormat">
@@ -80,8 +80,8 @@
8080
<ows:Operation name="GetDomain">
8181
<ows:DCP>
8282
<ows:HTTP>
83-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
84-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
83+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
84+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
8585
</ows:HTTP>
8686
</ows:DCP>
8787
<ows:Parameter name="ParameterName">
@@ -103,8 +103,8 @@
103103
<ows:Operation name="GetRecords">
104104
<ows:DCP>
105105
<ows:HTTP>
106-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
107-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
106+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
107+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
108108
</ows:HTTP>
109109
</ows:DCP>
110110
<ows:Parameter name="CONSTRAINTLANGUAGE">
@@ -214,8 +214,8 @@
214214
<ows:Operation name="GetRecordById">
215215
<ows:DCP>
216216
<ows:HTTP>
217-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
218-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
217+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
218+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
219219
</ows:HTTP>
220220
</ows:DCP>
221221
<ows:Parameter name="ElementSetName">
@@ -239,7 +239,7 @@
239239
<ows:Operation name="GetRepositoryItem">
240240
<ows:DCP>
241241
<ows:HTTP>
242-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
242+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
243243
</ows:HTTP>
244244
</ows:DCP>
245245
</ows:Operation>
@@ -265,7 +265,7 @@
265265
</ows:Constraint>
266266
<inspire_ds:ExtendedCapabilities xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
267267
<inspire_common:ResourceLocator>
268-
<inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
268+
<inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
269269
<inspire_common:MediaType>application/xml</inspire_common:MediaType>
270270
</inspire_common:ResourceLocator>
271271
<inspire_common:ResourceType>service</inspire_common:ResourceType>

‎tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<!-- PYCSW_VERSION -->
3-
<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" updateSequence="PYCSW_UPDATESEQUENCE" version="2.0.2" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
3+
<csw:Capabilities xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" version="2.0.2" updateSequence="PYCSW_UPDATESEQUENCE" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
44
<ows:ServiceIdentification>
55
<ows:Title>pycsw Geospatial Catalogue</ows:Title>
66
<ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
@@ -45,8 +45,8 @@
4545
<ows:Operation name="GetCapabilities">
4646
<ows:DCP>
4747
<ows:HTTP>
48-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
49-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
48+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
49+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
5050
</ows:HTTP>
5151
</ows:DCP>
5252
<ows:Parameter name="sections">
@@ -59,8 +59,8 @@
5959
<ows:Operation name="DescribeRecord">
6060
<ows:DCP>
6161
<ows:HTTP>
62-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
63-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
62+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
63+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
6464
</ows:HTTP>
6565
</ows:DCP>
6666
<ows:Parameter name="outputFormat">
@@ -80,8 +80,8 @@
8080
<ows:Operation name="GetDomain">
8181
<ows:DCP>
8282
<ows:HTTP>
83-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
84-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
83+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
84+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
8585
</ows:HTTP>
8686
</ows:DCP>
8787
<ows:Parameter name="ParameterName">
@@ -103,8 +103,8 @@
103103
<ows:Operation name="GetRecords">
104104
<ows:DCP>
105105
<ows:HTTP>
106-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
107-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
106+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
107+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
108108
</ows:HTTP>
109109
</ows:DCP>
110110
<ows:Parameter name="CONSTRAINTLANGUAGE">
@@ -214,8 +214,8 @@
214214
<ows:Operation name="GetRecordById">
215215
<ows:DCP>
216216
<ows:HTTP>
217-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
218-
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
217+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
218+
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
219219
</ows:HTTP>
220220
</ows:DCP>
221221
<ows:Parameter name="ElementSetName">
@@ -239,7 +239,7 @@
239239
<ows:Operation name="GetRepositoryItem">
240240
<ows:DCP>
241241
<ows:HTTP>
242-
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
242+
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
243243
</ows:HTTP>
244244
</ows:DCP>
245245
</ows:Operation>
@@ -265,7 +265,7 @@
265265
</ows:Constraint>
266266
<inspire_ds:ExtendedCapabilities xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
267267
<inspire_common:ResourceLocator>
268-
<inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
268+
<inspire_common:URL>http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg&amp;service=CSW&amp;version=2.0.2&amp;request=GetCapabilities</inspire_common:URL>
269269
<inspire_common:MediaType>application/xml</inspire_common:MediaType>
270270
</inspire_common:ResourceLocator>
271271
<inspire_common:ResourceType>service</inspire_common:ResourceType>

‎tests/functionaltests/suites/apiso/default.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
[server]
3131
home=.
32-
url=http://localhost/pycsw/csw.py?config=tests/suites/apiso/default.cfg
32+
url=http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso/default.cfg
3333
mimetype=application/xml; charset=UTF-8
3434
encoding=UTF-8
3535
language=en-US
@@ -73,7 +73,7 @@ contact_role=pointOfContact
7373

7474
[repository]
7575
# sqlite
76-
database=sqlite:///tests/suites/apiso/data/records.db
76+
database=sqlite:///tests/functionaltests/suites/apiso/data/records.db
7777
# postgres
7878
#database=postgres://username:password@localhost/pycsw
7979
table=records

‎tests/functionaltests/suites/apiso/expected/post_DescribeRecord.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<!-- PYCSW_VERSION -->
33
<csw:DescribeRecordResponse xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
4-
<csw:SchemaComponent parentSchema="gmd.xsd" schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd">
4+
<csw:SchemaComponent schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd" parentSchema="gmd.xsd">
55
<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1">
66
<!-- ================================= Annotation ================================ -->
77
<xs:annotation>
@@ -350,7 +350,7 @@
350350
<!-- =========================================================================== -->
351351
</xs:schema>
352352
</csw:SchemaComponent>
353-
<csw:SchemaComponent parentSchema="gmd.xsd" schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd">
353+
<csw:SchemaComponent schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd" parentSchema="gmd.xsd">
354354
<xs:schema targetNamespace="http://www.isotc211.org/2005/srv" elementFormDefault="qualified" version="0.1">
355355
<!-- ================================= Annotation ================================ -->
356356
<xs:annotation>

0 commit comments

Comments
 (0)