Skip to content

Commit

Permalink
[WIP] Fix configuration paths and db paths (#600) (#602)
Browse files Browse the repository at this point in the history 
* Fix configuration paths and db paths (#600)

* Fix tester with new path structure (#600)

* Update expected test results based on new paths (#600)
  • Loading branch information
@kalxas @tomkralidis
kalxas authored and tomkralidis committed Aug 5, 2019
1 parent 35ced57 commit df8234f
Show file tree
Hide file tree
Showing 257 changed files with 884 additions and 884 deletions.
4 changes: 2 additions & 2 deletions tests/functionaltests/suites/apiso-inspire/default.cfg
View file
Expand Up @@ -29,7 +29,7 @@

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

[repository]
# sqlite
database=sqlite:///tests/suites/cite/data/records.db
database=sqlite:///tests/functionaltests/suites/cite/data/cite.db
# postgres
#database=postgres://username:password@localhost/pycsw
table=records
Expand Down
26 changes: 13 additions & 13 deletions tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities-lang.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- PYCSW_VERSION -->
<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">
<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">
<ows:ServiceIdentification>
<ows:Title>pycsw Geospatial Catalogue</ows:Title>
<ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
Expand Down Expand Up @@ -45,8 +45,8 @@
<ows:Operation name="GetCapabilities">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="sections">
Expand All @@ -59,8 +59,8 @@
<ows:Operation name="DescribeRecord">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="outputFormat">
Expand All @@ -80,8 +80,8 @@
<ows:Operation name="GetDomain">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="ParameterName">
Expand All @@ -103,8 +103,8 @@
<ows:Operation name="GetRecords">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="CONSTRAINTLANGUAGE">
Expand Down Expand Up @@ -214,8 +214,8 @@
<ows:Operation name="GetRecordById">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="ElementSetName">
Expand All @@ -239,7 +239,7 @@
<ows:Operation name="GetRepositoryItem">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
</ows:Operation>
Expand All @@ -265,7 +265,7 @@
</ows:Constraint>
<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">
<inspire_common:ResourceLocator>
<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>
<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>
<inspire_common:MediaType>application/xml</inspire_common:MediaType>
</inspire_common:ResourceLocator>
<inspire_common:ResourceType>service</inspire_common:ResourceType>
Expand Down
26 changes: 13 additions & 13 deletions tests/functionaltests/suites/apiso-inspire/expected/get_GetCapabilities.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- PYCSW_VERSION -->
<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">
<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">
<ows:ServiceIdentification>
<ows:Title>pycsw Geospatial Catalogue</ows:Title>
<ows:Abstract>pycsw is an OGC CSW server implementation written in Python</ows:Abstract>
Expand Down Expand Up @@ -45,8 +45,8 @@
<ows:Operation name="GetCapabilities">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="sections">
Expand All @@ -59,8 +59,8 @@
<ows:Operation name="DescribeRecord">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="outputFormat">
Expand All @@ -80,8 +80,8 @@
<ows:Operation name="GetDomain">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="ParameterName">
Expand All @@ -103,8 +103,8 @@
<ows:Operation name="GetRecords">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="CONSTRAINTLANGUAGE">
Expand Down Expand Up @@ -214,8 +214,8 @@
<ows:Operation name="GetRecordById">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
<ows:Post xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
<ows:Parameter name="ElementSetName">
Expand All @@ -239,7 +239,7 @@
<ows:Operation name="GetRepositoryItem">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/suites/apiso-inspire/default.cfg"/>
<ows:Get xlink:type="simple" xlink:href="http://localhost/pycsw/csw.py?config=tests/functionaltests/suites/apiso-inspire/default.cfg"/>
</ows:HTTP>
</ows:DCP>
</ows:Operation>
Expand All @@ -265,7 +265,7 @@
</ows:Constraint>
<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">
<inspire_common:ResourceLocator>
<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>
<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>
<inspire_common:MediaType>application/xml</inspire_common:MediaType>
</inspire_common:ResourceLocator>
<inspire_common:ResourceType>service</inspire_common:ResourceType>
Expand Down
4 changes: 2 additions & 2 deletions tests/functionaltests/suites/apiso/default.cfg
View file
Expand Up @@ -29,7 +29,7 @@

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

[repository]
# sqlite
database=sqlite:///tests/suites/apiso/data/records.db
database=sqlite:///tests/functionaltests/suites/apiso/data/records.db
# postgres
#database=postgres://username:password@localhost/pycsw
table=records
Expand Down
4 changes: 2 additions & 2 deletions tests/functionaltests/suites/apiso/expected/post_DescribeRecord.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- PYCSW_VERSION -->
<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">
<csw:SchemaComponent parentSchema="gmd.xsd" schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd">
<csw:SchemaComponent schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd" parentSchema="gmd.xsd">
<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1">
<!-- ================================= Annotation ================================ -->
<xs:annotation>
Expand Down Expand Up @@ -350,7 +350,7 @@
<!-- =========================================================================== -->
</xs:schema>
</csw:SchemaComponent>
<csw:SchemaComponent parentSchema="gmd.xsd" schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd">
<csw:SchemaComponent schemaLanguage="XMLSCHEMA" targetNamespace="http://www.isotc211.org/2005/gmd" parentSchema="gmd.xsd">
<xs:schema targetNamespace="http://www.isotc211.org/2005/srv" elementFormDefault="qualified" version="0.1">
<!-- ================================= Annotation ================================ -->
<xs:annotation>
Expand Down

0 comments on commit df8234f

Please sign in to comment.