Skip to content

Commit

Permalink
fix tests; remove interfering contacts
Browse files Browse the repository at this point in the history
  • Loading branch information
@rshewitt
rshewitt committed Sep 18, 2024
1 parent 7151ee5 commit 514015d
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 569 deletions.
2 changes: 1 addition & 1 deletion test/readers/iso19115_2/tc_iso19115_2_citation.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def test_citation_complete
assert hDictionary.instance_of? Hash
assert_equal('ISO19115-2 citation title test 123456', hDictionary[:title])
assert_equal(3, hDictionary[:dates].size)
assert_equal(3, hDictionary[:responsibleParties].size)
assert_equal(1, hDictionary[:responsibleParties].size)
end

def test_no_citation_title
Expand Down
4 changes: 2 additions & 2 deletions test/readers/iso19115_2/tc_iso19115_2_responsibility.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ def test_responsibility_complete

party = hDictionary[:parties][0]
assert_equal(true, party[:isOrganization])
assert_equal('organization name', party[:name])
assert_equal('citation organization name', party[:name])
assert_equal('organization', party[:contactType])
assert_equal('organization name', party[:contactName])
assert_equal('citation organization name', party[:contactName])

assert_equal(['[email protected]'], party[:eMailList])
end
Expand Down
281 changes: 13 additions & 268 deletions test/readers/iso19115_2/testData/iso19115-2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>
<gmd:organisationName>
<gco:CharacterString>organization name</gco:CharacterString>
<gco:CharacterString>citation organization name</gco:CharacterString>
</gmd:organisationName>
<gmd:contactInfo>
<gmd:CI_Contact>
Expand Down Expand Up @@ -112,165 +112,6 @@
</gmd:role>
</gmd:CI_ResponsibleParty>
</gmd:citedResponsibleParty>

<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name</gco:CharacterString>
</gmd:positionName>
<gmd:contactInfo>
<gmd:CI_Contact>
<gmd:phone>
<gmd:CI_Telephone>
<gmd:voice>
<gco:CharacterString>phone name: 111-111-1111</gco:CharacterString>
</gmd:voice>
<gmd:facsimile/>
</gmd:CI_Telephone>
</gmd:phone>
<gmd:address>
<gmd:CI_Address>
<gmd:deliveryPoint>
<gco:CharacterString>address line 1</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:deliveryPoint>
<gco:CharacterString>address line 2</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:city>
<gco:CharacterString>city</gco:CharacterString>
</gmd:city>
<gmd:administrativeArea>
<gco:CharacterString>administrative area</gco:CharacterString>
</gmd:administrativeArea>
<gmd:postalCode>
<gco:CharacterString>postal code</gco:CharacterString>
</gmd:postalCode>
<gmd:country>
<gco:CharacterString>country</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress>
<gco:CharacterString>[email protected]</gco:CharacterString>
</gmd:electronicMailAddress>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
<gmd:hoursOfService/>
<gmd:contactInstructions/>
</gmd:CI_Contact>
</gmd:contactInfo>
<gmd:role>
<gmd:CI_RoleCode codeList="http://mdtranslator.adiwg.org/api/codelists?format=xml#CI_RoleCode" codeListValue="originator" codeSpace="006"/>
</gmd:role>
</gmd:CI_ResponsibleParty>
</gmd:citedResponsibleParty>

<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name 2</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name 2</gco:CharacterString>
</gmd:positionName>
<gmd:contactInfo>
<gmd:CI_Contact>
<gmd:phone>
<gmd:CI_Telephone>
<gmd:voice>
<gco:CharacterString>phone name: 111-111-2222</gco:CharacterString>
</gmd:voice>
<gmd:facsimile/>
</gmd:CI_Telephone>
</gmd:phone>
<gmd:address>
<gmd:CI_Address>
<gmd:deliveryPoint>
<gco:CharacterString>address line 1234</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:deliveryPoint>
<gco:CharacterString>address line 2567</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:city>
<gco:CharacterString>city 5</gco:CharacterString>
</gmd:city>
<gmd:administrativeArea>
<gco:CharacterString>administrative area 123</gco:CharacterString>
</gmd:administrativeArea>
<gmd:postalCode>
<gco:CharacterString>postal code test</gco:CharacterString>
</gmd:postalCode>
<gmd:country>
<gco:CharacterString>country test value</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress/>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
<gmd:hoursOfService/>
<gmd:contactInstructions/>
</gmd:CI_Contact>
</gmd:contactInfo>
<gmd:role>
<gmd:CI_RoleCode codeList="http://mdtranslator.adiwg.org/api/codelists?format=xml#CI_RoleCode" codeListValue="publisher" codeSpace="006"/>
</gmd:role>
</gmd:CI_ResponsibleParty>
</gmd:citedResponsibleParty>

<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name 10293</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name a0s8hda98hd</gco:CharacterString>
</gmd:positionName>
<gmd:contactInfo>
<gmd:CI_Contact>
<gmd:phone>
<gmd:CI_Telephone>
<gmd:voice>
<gco:CharacterString>phone name: 111-111-2222</gco:CharacterString>
</gmd:voice>
<gmd:facsimile/>
</gmd:CI_Telephone>
</gmd:phone>
<gmd:address>
<gmd:CI_Address>
<gmd:deliveryPoint>
<gco:CharacterString>address line 1234</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:deliveryPoint>
<gco:CharacterString>address line 2567</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:city>
<gco:CharacterString>city 5</gco:CharacterString>
</gmd:city>
<gmd:administrativeArea>
<gco:CharacterString>administrative area 123</gco:CharacterString>
</gmd:administrativeArea>
<gmd:postalCode>
<gco:CharacterString>postal code test</gco:CharacterString>
</gmd:postalCode>
<gmd:country>
<gco:CharacterString>country test value</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress/>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
<gmd:hoursOfService/>
<gmd:contactInstructions/>
</gmd:CI_Contact>
</gmd:contactInfo>
<gmd:role>
<gmd:CI_RoleCode codeList="http://mdtranslator.adiwg.org/api/codelists?format=xml#CI_RoleCode" codeListValue="pointOfContact" codeSpace="006"/>
</gmd:role>
</gmd:CI_ResponsibleParty>
</gmd:citedResponsibleParty>

<gmd:presentationForm/>
<gmd:series/>
<gmd:otherCitationDetails/>
Expand All @@ -291,7 +132,7 @@
<gmd:pointOfContact>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name</gco:CharacterString>
<gco:CharacterString>test person test name</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name</gco:CharacterString>
Expand Down Expand Up @@ -326,7 +167,9 @@
<gmd:country>
<gco:CharacterString>country</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress/>
<gmd:electronicMailAddress>
<gco:CharacterString>[email protected]</gco:CharacterString>
</gmd:electronicMailAddress>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
Expand Down Expand Up @@ -366,7 +209,7 @@
<gmd:thesaurusName>
<gmd:CI_Citation>
<gmd:title>
<gco:CharacterString>ISO 19115 Topic Category</gco:CharacterString>
<gco:CharacterString>ISO Topic Categories</gco:CharacterString>
</gmd:title>
<gmd:alternateTitle/>
<gmd:date>
Expand Down Expand Up @@ -517,57 +360,7 @@
</gmd:date>
<gmd:edition/>
<gmd:identifier/>
<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name</gco:CharacterString>
</gmd:positionName>
<gmd:contactInfo>
<gmd:CI_Contact>
<gmd:phone>
<gmd:CI_Telephone>
<gmd:voice>
<gco:CharacterString>phone name: 111-111-1111</gco:CharacterString>
</gmd:voice>
<gmd:facsimile/>
</gmd:CI_Telephone>
</gmd:phone>
<gmd:address>
<gmd:CI_Address>
<gmd:deliveryPoint>
<gco:CharacterString>address line 1</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:deliveryPoint>
<gco:CharacterString>address line 2</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:city>
<gco:CharacterString>city</gco:CharacterString>
</gmd:city>
<gmd:administrativeArea>
<gco:CharacterString>administrative area</gco:CharacterString>
</gmd:administrativeArea>
<gmd:postalCode>
<gco:CharacterString>postal code</gco:CharacterString>
</gmd:postalCode>
<gmd:country>
<gco:CharacterString>country</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress/>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
<gmd:hoursOfService/>
<gmd:contactInstructions/>
</gmd:CI_Contact>
</gmd:contactInfo>
<gmd:role>
<gmd:CI_RoleCode codeList="http://mdtranslator.adiwg.org/api/codelists?format=xml#CI_RoleCode" codeListValue="originator" codeSpace="006"/>
</gmd:role>
</gmd:CI_ResponsibleParty>
</gmd:citedResponsibleParty>
<gmd:citedResponsibleParty/>
<gmd:presentationForm/>
<gmd:series/>
<gmd:otherCitationDetails/>
Expand All @@ -593,7 +386,7 @@
<gmd:pointOfContact>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name</gco:CharacterString>
<gco:CharacterString>person name asoida891h2e</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name</gco:CharacterString>
Expand Down Expand Up @@ -779,57 +572,7 @@
</gmd:date>
<gmd:edition/>
<gmd:identifier/>
<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>
<gmd:individualName>
<gco:CharacterString>person name</gco:CharacterString>
</gmd:individualName>
<gmd:positionName>
<gco:CharacterString>position name</gco:CharacterString>
</gmd:positionName>
<gmd:contactInfo>
<gmd:CI_Contact>
<gmd:phone>
<gmd:CI_Telephone>
<gmd:voice>
<gco:CharacterString>phone name: 111-111-1111</gco:CharacterString>
</gmd:voice>
<gmd:facsimile/>
</gmd:CI_Telephone>
</gmd:phone>
<gmd:address>
<gmd:CI_Address>
<gmd:deliveryPoint>
<gco:CharacterString>address line 1</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:deliveryPoint>
<gco:CharacterString>address line 2</gco:CharacterString>
</gmd:deliveryPoint>
<gmd:city>
<gco:CharacterString>city</gco:CharacterString>
</gmd:city>
<gmd:administrativeArea>
<gco:CharacterString>administrative area</gco:CharacterString>
</gmd:administrativeArea>
<gmd:postalCode>
<gco:CharacterString>postal code</gco:CharacterString>
</gmd:postalCode>
<gmd:country>
<gco:CharacterString>country</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress/>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
<gmd:hoursOfService/>
<gmd:contactInstructions/>
</gmd:CI_Contact>
</gmd:contactInfo>
<gmd:role>
<gmd:CI_RoleCode codeList="http://mdtranslator.adiwg.org/api/codelists?format=xml#CI_RoleCode" codeListValue="originator" codeSpace="006"/>
</gmd:role>
</gmd:CI_ResponsibleParty>
</gmd:citedResponsibleParty>
<gmd:citedResponsibleParty/>
<gmd:presentationForm/>
<gmd:series/>
<gmd:otherCitationDetails/>
Expand Down Expand Up @@ -885,7 +628,9 @@
<gmd:country>
<gco:CharacterString>country</gco:CharacterString>
</gmd:country>
<gmd:electronicMailAddress/>
<gmd:electronicMailAddress>
<gco:CharacterString>poc [email protected]</gco:CharacterString>
</gmd:electronicMailAddress>
</gmd:CI_Address>
</gmd:address>
<gmd:onlineResource/>
Expand Down Expand Up @@ -1005,4 +750,4 @@
</gmd:MD_DataIdentification>
</gmd:identificationInfo>

</gmi:MI_Metadata>
</gmi:MI_Metadata>
4 changes: 2 additions & 2 deletions test/translator/tc_iso19115_2_to_dcatus.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ def test_publisher
dcatusNS = ADIWG::Mdtranslator::Writers::Dcat_us::Publisher
res = dcatusNS.build(@@intMetadata).target!

expected = '{"@type":"org:Organization","name":"organization name"}'
expected = '{"@type":"org:Organization","name":"citation organization name"}'
assert_equal(expected, res)
end

def test_contact_point
dcatusNS = ADIWG::Mdtranslator::Writers::Dcat_us::ContactPoint
res = dcatusNS.build(@@intMetadata).target!

expected = '{"@type":"vcard:Contact","fn":"person name","hasEmail":"email@test.com"}'
expected = '{"@type":"vcard:Contact","fn":"test person test name","hasEmail":"whatever@gmail.com"}'
assert_equal(expected, res)
end

Expand Down
Loading

0 comments on commit 514015d

Please sign in to comment.