Commit 299479fd authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1297-identifiers-org-urls' into 'devel_15.0.x'

allow for both http and https urls

See merge request !1204
parents 27f759d8 48f4a169
Pipeline #29082 passed with stage
in 11 minutes and 27 seconds
minerva (15.0.2) stable; urgency=medium
* Bug fix: annotations using identifiers.org urls sometimes required http and
sometimes required https url (#1297)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 29 Jun 2020 11:00:00 +0200
minerva (15.0.1) stable; urgency=medium
* Bug fix: when there was problem with DAPI minerva threw unexpected error
(#1316)
......
......@@ -91,6 +91,24 @@ public class MiriamTypeGenericTest extends ModelTestFunctions {
}
}
@Test
public void httpAndHttpsForIdentifiersOrg() {
if (!deprecated) {
boolean httpIdentifiersOrgUriExists = false;
boolean httpsIdentifiersOrgUriExists = false;
for (String uri : miriamType.getUris()) {
if (uri.toLowerCase().startsWith("http://identifiers.org/") && uri.endsWith("/")) {
httpIdentifiersOrgUriExists = true;
}
if (uri.toLowerCase().startsWith("https://identifiers.org/") && uri.endsWith("/")) {
httpsIdentifiersOrgUriExists = true;
}
}
assertTrue("Http identifiers.org url does not exists for: " + miriamType, httpIdentifiersOrgUriExists);
assertTrue("Https identifiers.org url does not exists for: " + miriamType, httpsIdentifiersOrgUriExists);
}
}
@Test
public void testGetMiriamByIncompleteUri() throws Exception {
for (String uri : miriamType.getUris()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment