From 9ca022093b164569521c49509dec6137d314707b Mon Sep 17 00:00:00 2001 From: eblondel Date: Thu, 17 Oct 2013 23:35:41 +0200 Subject: [PATCH] #102 master - fix GSLayerEncoder21Test --- .../rest/encoder/GSLayerEncoder21Test.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder21Test.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder21Test.java index 11ebef6..636ff86 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder21Test.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/GSLayerEncoder21Test.java @@ -65,28 +65,28 @@ public class GSLayerEncoder21Test { }else if(key.matches("authorityURLs")){ String content = el.getValue(); content = content.substring(2); - content = content.substring(0, content.length()-2); + content = content.substring(0, content.length()-3); String[] props = content.split(","); for(String prop : props){ - String[] kvp = prop.split(":"); - if(kvp[0].matches(AuthorityURLInfo.name.name())){ - Assert.assertEquals("authority1", kvp[1]); - }else if(kvp[0].matches(AuthorityURLInfo.href.name())){ - Assert.assertEquals("http://www.authority1.org", kvp[1]); + String[] kvp = prop.split("\":"); + if(kvp[0].replace("\"", "").matches(AuthorityURLInfo.name.name())){ + Assert.assertEquals("authority1", kvp[1].replace("\"", "")); + }else if(kvp[0].replaceAll("\"", "").matches(AuthorityURLInfo.href.name())){ + Assert.assertEquals("http://www.authority1.org", kvp[1].replace("\"", "")); } } }else if(key.matches("identifiers")){ String content = el.getValue(); content = content.substring(2); - content = content.substring(0, content.length()-2); + content = content.substring(0, content.length()-3); String[] props = content.split(","); for(String prop : props){ - String[] kvp = prop.split(":"); - if(kvp[0].matches(IdentifierInfo.authority.name())){ - Assert.assertEquals("authority1", kvp[1]); - }else if(kvp[0].matches(IdentifierInfo.identifier.name())){ - Assert.assertEquals("identifier1", kvp[1]); + String[] kvp = prop.split("\":"); + if(kvp[0].replace("\"", "").matches(IdentifierInfo.authority.name())){ + Assert.assertEquals("authority1", kvp[1].replace("\"", "")); + }else if(kvp[0].replace("\"", "").matches(IdentifierInfo.identifier.name())){ + Assert.assertEquals("identifier1", kvp[1].replace("\"", "")); } } }