Skip to content

Commit

Permalink
update harvesting tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomkralidis
tomkralidis committed Oct 10, 2014
1 parent a63470d commit 8e24b43
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 71 deletions.
40 changes: 8 additions & 32 deletions tests/expected/suites_harvesting_post_Harvest-wms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,26 @@
<csw:HarvestResponse xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dct="http://purl.org/dc/terms/" xmlns:ows="http://www.opengis.net/ows" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml" xmlns:dif="http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:ogc="http://www.opengis.net/ogc" xmlns:fgdc="http://www.opengis.net/cat/csw/csdgm" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:os="http://a9.com/-/spec/opensearch/1.1/" xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-publication.xsd">
<csw:TransactionResponse version="2.0.2">
<csw:TransactionSummary>
<csw:totalInserted>10</csw:totalInserted>
<csw:totalInserted>4</csw:totalInserted>
<csw:totalUpdated>0</csw:totalUpdated>
<csw:totalDeleted>0</csw:totalDeleted>
</csw:TransactionSummary>
<csw:InsertResult>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER</dc:identifier>
<dc:title>Wisconsin Lake Clarity</dc:title>
<dc:title>IEM WMS Service</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-Highways</dc:identifier>
<dc:title>Highways</dc:title>
<dc:identifier>PYCSW_IDENTIFIER-time_idx</dc:identifier>
<dc:title>NEXRAD BASE REFLECT</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-LakesTSI</dc:identifier>
<dc:title>LakesTSI</dc:title>
<dc:identifier>PYCSW_IDENTIFIER-nexrad-n0r-wmst</dc:identifier>
<dc:title>NEXRAD BASE REFLECT</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-LakeClarity</dc:identifier>
<dc:title>Wisconsin Lake Clarity</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-LakesTSI_0305</dc:identifier>
<dc:title>LakesTSI_0305</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-Relief</dc:identifier>
<dc:title>Relief</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-LakeNames_0305</dc:identifier>
<dc:title>LakeNames_0305</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-Roads</dc:identifier>
<dc:title>Roads</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-LakeNames</dc:identifier>
<dc:title>LakeNames</dc:title>
</csw:BriefRecord>
<csw:BriefRecord>
<dc:identifier>PYCSW_IDENTIFIER-Counties</dc:identifier>
<dc:title>Counties</dc:title>
<dc:identifier>PYCSW_IDENTIFIER-nexrad_base_reflect</dc:identifier>
<dc:title>IEM WMS Service</dc:title>
</csw:BriefRecord>
</csw:InsertResult>
</csw:TransactionResponse>
Expand Down
30 changes: 11 additions & 19 deletions tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-dc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,20 @@
<csw:SearchResults nextRecord="0" numberOfRecordsMatched="1" numberOfRecordsReturned="1" recordSchema="http://www.opengis.net/cat/csw/2.0.2" elementSet="full">
<csw:Record>
<dc:identifier>PYCSW_IDENTIFIER</dc:identifier>
<dc:title>Wisconsin Lake Clarity</dc:title>
<dc:title>IEM WMS Service</dc:title>
<dc:type>service</dc:type>
<dc:subject>SSEC</dc:subject>
<dc:subject>PAW</dc:subject>
<dc:subject>remote sensing</dc:subject>
<dc:subject>meteorology</dc:subject>
<dc:subject>atmospheric science</dc:subject>
<dc:subject>University of Wisconsin</dc:subject>
<dc:subject>Madison</dc:subject>
<dc:subject>weather</dc:subject>
<dc:subject>land</dc:subject>
<dc:subject></dc:subject>
<dc:format>OGC:WMS</dc:format>
<dct:references scheme="OGC:WMS">http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map</dct:references>
<dct:abstract>General: This server hosts a set of experimental OGC Web Services of remote sensing data products for use in a broad range of both desktop and mobile device clients.</dct:abstract>
<dc:creator>Dr. Sam Batzli</dc:creator>
<dc:publisher>Space Science and Engineering Center, University of Wisconsin-Madison</dc:publisher>
<dc:contributor>Dr. Sam Batzli</dc:contributor>
<dc:source>http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map</dc:source>
<dc:rights>The following attribution is required if published or reproduced: Source: Space Science and Engineering Center, University of Wisconsin-Madison</dc:rights>
<dct:references scheme="OGC:WMS">http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</dct:references>
<dct:abstract>IEM generated CONUS composite of NWS WSR-88D level III base reflectivity.</dct:abstract>
<dc:creator>Daryl Herzmann</dc:creator>
<dc:publisher>Iowa State University</dc:publisher>
<dc:contributor>Daryl Herzmann</dc:contributor>
<dc:source>http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</dc:source>
<dc:rights>None</dc:rights>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>42.41 -93.03</ows:LowerCorner>
<ows:UpperCorner>47.13 -86.64</ows:UpperCorner>
<ows:LowerCorner>24.0 -126.0</ows:LowerCorner>
<ows:UpperCorner>50.0 -66.0</ows:UpperCorner>
</ows:BoundingBox>
</csw:Record>
</csw:SearchResults>
Expand Down
38 changes: 21 additions & 17 deletions tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-layer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@
<!-- PYCSW_VERSION -->
<csw:GetRecordsResponse xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dct="http://purl.org/dc/terms/" xmlns:ows="http://www.opengis.net/ows" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml" xmlns:dif="http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:ogc="http://www.opengis.net/ogc" xmlns:fgdc="http://www.opengis.net/cat/csw/csdgm" xmlns:inspire_ds="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:os="http://a9.com/-/spec/opensearch/1.1/" xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9" 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:SearchStatus timestamp="PYCSW_TIMESTAMP"/>
<csw:SearchResults nextRecord="0" numberOfRecordsMatched="1" numberOfRecordsReturned="1" recordSchema="http://www.opengis.net/cat/csw/2.0.2" elementSet="full">
<csw:SearchResults nextRecord="0" numberOfRecordsMatched="2" numberOfRecordsReturned="2" recordSchema="http://www.opengis.net/cat/csw/2.0.2" elementSet="full">
<csw:Record>
<dc:identifier>PYCSW_IDENTIFIER</dc:identifier>
<dc:title>Wisconsin Lake Clarity</dc:title>
<dc:title>NEXRAD BASE REFLECT</dc:title>
<dc:type>dataset</dc:type>
<dc:subject>SSEC</dc:subject>
<dc:subject>PAW</dc:subject>
<dc:subject>remote sensing</dc:subject>
<dc:subject>meteorology</dc:subject>
<dc:subject>atmospheric science</dc:subject>
<dc:subject>University of Wisconsin</dc:subject>
<dc:subject>Madison</dc:subject>
<dc:subject>weather</dc:subject>
<dc:subject>land</dc:subject>
<dct:references scheme="OGC:WMS">http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map</dct:references>
<dct:references scheme="WWW:LINK-1.0-http--image-thumbnail">http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=%2Fhome%2Fwms%2Fdata%2Fmapfiles%2Flakestsi.map&amp;layers=LakeClarity&amp;width=200&amp;version=1.1.1&amp;bbox=-93.0307%2C42.4104%2C-86.6404%2C47.1335&amp;service=WMS&amp;format=image%2Fpng&amp;styles=&amp;srs=EPSG%3A4326&amp;request=GetMap&amp;height=200</dct:references>
<dct:abstract>General: This server hosts a set of experimental OGC Web Services of remote sensing data products for use in a broad range of both desktop and mobile device clients.</dct:abstract>
<dc:source>http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map</dc:source>
<dc:subject></dc:subject>
<dct:references scheme="OGC:WMS">http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</dct:references>
<dct:references scheme="WWW:LINK-1.0-http--image-thumbnail">http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi?layers=time_idx&amp;width=200&amp;version=1.1.1&amp;bbox=-126.0%2C24.0%2C-66.0%2C50.0&amp;service=WMS&amp;format=image%2Fpng&amp;styles=&amp;srs=EPSG%3A4326&amp;request=GetMap&amp;height=200</dct:references>
<dc:source>http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</dc:source>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>42.41 -93.03</ows:LowerCorner>
<ows:UpperCorner>47.13 -86.64</ows:UpperCorner>
<ows:LowerCorner>24.0 -126.0</ows:LowerCorner>
<ows:UpperCorner>50.0 -66.0</ows:UpperCorner>
</ows:BoundingBox>
</csw:Record>
<csw:Record>
<dc:identifier>PYCSW_IDENTIFIER</dc:identifier>
<dc:title>NEXRAD BASE REFLECT</dc:title>
<dc:type>dataset</dc:type>
<dc:subject></dc:subject>
<dct:references scheme="OGC:WMS">http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</dct:references>
<dct:references scheme="WWW:LINK-1.0-http--image-thumbnail">http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi?layers=nexrad-n0r-wmst&amp;width=200&amp;version=1.1.1&amp;bbox=-126.0%2C24.0%2C-66.0%2C50.0&amp;service=WMS&amp;format=image%2Fpng&amp;styles=&amp;srs=EPSG%3A4326&amp;request=GetMap&amp;height=200</dct:references>
<dc:source>http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</dc:source>
<ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
<ows:LowerCorner>24.0 -126.0</ows:LowerCorner>
<ows:UpperCorner>50.0 -66.0</ows:UpperCorner>
</ows:BoundingBox>
</csw:Record>
</csw:SearchResults>
Expand Down
2 changes: 1 addition & 1 deletion tests/expected/suites_harvesting_post_Transaction-000-delete-all.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<csw:TransactionSummary>
<csw:totalInserted>0</csw:totalInserted>
<csw:totalUpdated>0</csw:totalUpdated>
<csw:totalDeleted>127</csw:totalDeleted>
<csw:totalDeleted>121</csw:totalDeleted>
</csw:TransactionSummary>
</csw:TransactionResponse>
2 changes: 1 addition & 1 deletion tests/suites/harvesting/post/Harvest-wms.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Harvest xmlns="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:ows="http://www.opengis.net/ows" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:gml="http://www.opengis.net/gml" 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-publication.xsd" service="CSW" version="2.0.2">
<Source>http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map</Source>
<Source>http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</Source>
<ResourceType>http://www.opengis.net/wms</ResourceType>
<ResourceFormat>application/xml</ResourceFormat>
</Harvest>
2 changes: 1 addition & 1 deletion tests/suites/harvesting/post/Harvest-zzz-post-GetRecords-filter-wms-layer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ogc:PropertyIsEqualTo>
<ogc:PropertyIsEqualTo>
<ogc:PropertyName>csw:AnyText</ogc:PropertyName>
<ogc:Literal>%Lake Clarity%</ogc:Literal>
<ogc:Literal>%nexrad%</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:And>
</ogc:Filter>
Expand Down

0 comments on commit 8e24b43

Please sign in to comment.