Added tests to data service test script. Couple of minor changes to data service for test compliance.

pull/702/head
arielak 2014-10-09 20:21:48 -04:00 committed by Ariel Abrams-Kudan
parent f194622b9a
commit d64ccf4e84
2 changed files with 1328 additions and 28 deletions

View File

@ -272,6 +272,9 @@ public class MITREidDataService_1_0 implements MITREidDataService {
} }
private <T> T base64UrlDecodeObject(String encoded, Class<T> type) throws IOException { private <T> T base64UrlDecodeObject(String encoded, Class<T> type) throws IOException {
if(encoded == null || encoded.isEmpty()) {
return null;
}
byte[] decoded = BaseEncoding.base64Url().decode(encoded); byte[] decoded = BaseEncoding.base64Url().decode(encoded);
ByteArrayInputStream bais = new ByteArrayInputStream(decoded); ByteArrayInputStream bais = new ByteArrayInputStream(decoded);
ObjectInputStream ois = new ObjectInputStream(bais); ObjectInputStream ois = new ObjectInputStream(bais);
@ -1221,5 +1224,6 @@ public class MITREidDataService_1_0 implements MITREidDataService {
} }
grantOldToNewIdMap.clear(); grantOldToNewIdMap.clear();
grantToWhitelistedSiteRefs.clear(); grantToWhitelistedSiteRefs.clear();
whitelistedSiteOldToNewIdMap.clear();
} }
} }