X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fdbsources%2FPDBRestClientTest.java;h=c35cbe90da758e7a8cb1e187fdf6933a793a00fd;hb=refs%2Fheads%2Ffeatures%2FJAL-1667_PDBe_Search_API;hp=ba07562a5f60de84638e9b42fd3b7eccf37827f2;hpb=fecc0f8bab5ea8327eb8602fce11a3177ecfd38e;p=jalview.git diff --git a/test/jalview/ws/dbsources/PDBRestClientTest.java b/test/jalview/ws/dbsources/PDBRestClientTest.java index ba07562..c35cbe9 100644 --- a/test/jalview/ws/dbsources/PDBRestClientTest.java +++ b/test/jalview/ws/dbsources/PDBRestClientTest.java @@ -61,9 +61,12 @@ public class PDBRestClientTest wantedFields.add(PDBDocField.GENUS); wantedFields.add(PDBDocField.GENE_NAME); wantedFields.add(PDBDocField.TITLE); - assertEquals("molecule_type,pdb_id,genus,gene_name,title", - PDBRestClient - .getPDBDocFieldsAsCommaDelimitedString(wantedFields)); + + String expectedResult = "molecule_type,pdb_id,genus,gene_name,title"; + String actualResult = PDBRestClient + .getPDBDocFieldsAsCommaDelimitedString(wantedFields); + + assertEquals("", expectedResult, actualResult); } @Test @@ -94,8 +97,13 @@ public class PDBRestClientTest String parsedErrorResponse = PDBRestClient .parseJsonExceptionString(jsonErrorResponse); - String expectedErrorMsg = "org.apache.solr.search.SyntaxError: Cannot parse 'text:abc OR text:go:abc AND molecule_sequence:['' TO *]': Encountered \" \":\" \": \"\" at line 1, column 19.{\"q\":\"text:abc OR text:go:abc AND molecule_sequence:['' TO *]\",\"fl\":\"pdb_id\",\"sort\":\"\",\"rows\":\"100\",\"wt\":\"json\"}"; + System.out.println(parsedErrorResponse); + String expectedErrorMsg = "\n============= PDB Rest Client RunTime error =============\n" + + "Status: 400\n" + + "Message: org.apache.solr.search.SyntaxError: Cannot parse 'text:abc OR text:go:abc AND molecule_sequence:['' TO *]': Encountered \" \":\" \": \"\" at line 1, column 19.\n" + + "query: text:abc OR text:go:abc AND molecule_sequence:['' TO *]\n" + + "fl: pdb_id\n"; assertEquals(expectedErrorMsg, parsedErrorResponse); }