Changeset 7196 for FCSEndpointTester
- Timestamp:
- 10/11/18 12:13:58 (6 years ago)
- Location:
- FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester
- Files:
-
- 2 added
- 1 deleted
- 30 edited
Legend:
- Unmodified
- Added
- Removed
-
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSEndpointTester.java
r7169 r7196 43 43 import org.apache.http.client.config.RequestConfig; 44 44 import org.apache.http.client.methods.HttpHead; 45 import org.apache.http.client.protocol.HttpClientContext; 45 46 import org.apache.http.client.utils.HttpClientUtils; 46 47 import org.apache.http.config.SocketConfig; … … 54 55 55 56 import eu.clarin.sru.client.SRUClient; 57 import eu.clarin.sru.client.SRUClientConfig; 56 58 import eu.clarin.sru.client.SRUClientException; 57 59 import eu.clarin.sru.client.SRUExplainRequest; 58 60 import eu.clarin.sru.client.SRUExplainResponse; 59 import eu.clarin.sru.client.SRUSimpleClient;60 61 import eu.clarin.sru.client.SRUVersion; 61 62 import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder; … … 313 314 List<FCSTestResult> results = null; 314 315 315 final SRUSimpleClient client = context.getClient(); 316 final FCSTestHandler handler = new FCSTestHandler(); 316 final SRUClient client = context.getClient(); 317 317 final int totalCount = tests.size(); 318 318 int num = 1; … … 322 322 results = new LinkedList<FCSTestResult>(); 323 323 } 324 325 324 logger.debug("running test {}:{}", num, test.getName()); 326 325 final String message = String.format( … … 333 332 FCSTestResult result = null; 334 333 try { 335 handler.reset();336 334 logcapturehandler.publish(new LogRecord(Level.FINE, 337 335 "running test class " + test.getClass().getName())); 338 result = test.perform(context, client , handler);336 result = test.perform(context, client); 339 337 result.setLogRecords(logcapturehandler.getLogRecords()); 340 338 } catch (SRUClientException e) { … … 351 349 logcapturehandler.getLogRecords()); 352 350 } catch (Throwable t) { 353 final LogRecord record = 354 new LogRecord(Level.SEVERE, "Internal Error!");355 record.setThrown(t);351 final LogRecord record = new LogRecord(Level.SEVERE, 352 "The endpoint tester as triggered an internal error! " + 353 "Please report to developers."); 356 354 logcapturehandler.publish(record); 357 355 result = new FCSTestResult(test, … … 359 357 record.getMessage(), 360 358 logcapturehandler.getLogRecords()); 359 logger.error("an internal error occured", t); 361 360 } 362 361 results.add(result); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSTest.java
r7172 r7196 17 17 package eu.clarin.fcs.tester; 18 18 19 import java.util.Collections; 19 20 import java.util.List; 20 21 import java.util.logging.LogRecord; 21 22 22 23 import eu.clarin.sru.client.SRUClient; 23 24 import eu.clarin.sru.client.SRUClientException; 24 import eu.clarin.sru.client.SRUSimpleClient; 25 import eu.clarin.sru.client.SRUDiagnostic; 26 import eu.clarin.sru.client.SRUExplainResponse; 27 import eu.clarin.sru.client.SRUScanResponse; 28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 import eu.clarin.sru.client.SRUTerm; 25 30 26 31 … … 36 41 37 42 public abstract FCSTestResult perform(FCSTestContext context, 38 SRUSimpleClient client, FCSTestHandler handler) 39 throws SRUClientException; 43 SRUClient client) throws SRUClientException; 40 44 41 45 … … 70 74 71 75 76 protected boolean findDiagnostic(SRUExplainResponse res, String uri) { 77 return dofindDiagnostic(res.getDiagnostics(), uri); 78 79 } 80 81 82 protected boolean findDiagnostic(SRUScanResponse res, String uri) { 83 return dofindDiagnostic(res.getDiagnostics(), uri); 84 85 } 86 87 88 protected boolean findDiagnostic(SRUSearchRetrieveResponse res, 89 String uri) { 90 return dofindDiagnostic(res.getDiagnostics(), uri); 91 92 } 93 94 95 private boolean dofindDiagnostic(List<SRUDiagnostic> diagnostics, 96 String uri) { 97 if (diagnostics != null) { 98 for (SRUDiagnostic diagnostic : diagnostics) { 99 if (uri.equals(diagnostic.getURI())) { 100 return true; 101 } 102 } 103 } 104 return false; 105 } 106 107 108 // protected int getDiagnosticCount(SRUExplainResponse res) { 109 // return doGetDiagnosticCount(res.getDiagnostics()); 110 // } 111 // 112 // 113 // protected int getDiagnosticCount(SRUScanResponse res) { 114 // return doGetDiagnosticCount(res.getDiagnostics()); 115 // } 116 // 117 // 118 // protected int getDiagnosticCount(SRUSearchRetrieveResponse res) { 119 // return doGetDiagnosticCount(res.getDiagnostics()); 120 // } 121 // 122 // 123 // private int doGetDiagnosticCount(List<SRUDiagnostic> diagnostics) { 124 // return diagnostics != null ? diagnostics.size() : 0; 125 // } 126 127 protected int getTermsCount(SRUScanResponse res) { 128 return res.getTerms() != null ? res.getTerms().size() : 1; 129 } 130 131 protected List<SRUTerm> getTerms(SRUScanResponse res) { 132 if (res.getTerms() != null) { 133 return res.getTerms(); 134 } else { 135 return Collections.emptyList(); 136 } 137 } 138 139 140 protected boolean isDiagnostic(SRUDiagnostic d, String uri) { 141 return uri.equals(d.getURI()); 142 } 143 144 72 145 protected FCSTestResult makeSuccess() { 73 146 return new FCSTestResult(this, FCSTestResult.Code.SUCCESS, 74 147 "The test case was processed successfully"); 148 } 149 150 151 protected FCSTestResult makeSkipped() { 152 return new FCSTestResult(this, FCSTestResult.Code.SKIPPED, 153 "The test case was skipped because it was not applicable"); 75 154 } 76 155 -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSTestContext.java
r7116 r7196 17 17 package eu.clarin.fcs.tester; 18 18 19 import java.util.HashMap; 20 import java.util.Map; 21 19 22 import org.apache.commons.lang.RandomStringUtils; 20 23 24 import eu.clarin.sru.client.SRUClient; 21 25 import eu.clarin.sru.client.SRUExplainRequest; 22 26 import eu.clarin.sru.client.SRUScanRequest; 23 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 24 import eu.clarin.sru.client.SRUSimpleClient;25 28 import eu.clarin.sru.client.SRUVersion; 26 29 import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder; … … 29 32 30 33 public class FCSTestContext { 34 public static final String PROP_SUPPORTS_ADV = "supports_adv_search"; 31 35 private final FCSTestProfile profile; 32 36 private final String baseURI; … … 38 42 RandomStringUtils.randomAlphanumeric(16); 39 43 private final String unicodeSearchTerm = "öÀÌÃÃÃÃâ¬"; 40 private SRUSimpleClient client; 44 private SRUClient client; 45 private Map<String, Object> properies; 41 46 42 47 … … 98 103 break; 99 104 } 100 client = builder.build SimpleClient();105 client = builder.buildClient(); 101 106 } 102 107 … … 142 147 143 148 144 public SRU SimpleClient getClient() {149 public SRUClient getClient() { 145 150 return client; 146 151 } … … 170 175 } 171 176 177 public void setProperty(String key, Object value) { 178 if (properies == null) { 179 properies = new HashMap<String, Object>(); 180 } 181 properies.put(key, value); 182 } 183 184 public Object getProperty(String key) { 185 if (properies != null) { 186 return properies.get(key); 187 } else { 188 return null; 189 } 190 } 191 192 public boolean hasProperty(String key) { 193 if (properies != null) { 194 return properies.containsKey(key); 195 } else { 196 return false; 197 } 198 } 199 172 200 } // class FCSTestContext -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSTestResult.java
r7116 r7196 23 23 public class FCSTestResult { 24 24 public static enum Code { 25 SUCCESS, WARNING, ERROR 25 SUCCESS, WARNING, ERROR, SKIPPED; 26 26 } 27 27 -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestExplain1.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUExplainRequest; 27 import eu.clarin.sru.client.SRU SimpleClient;27 import eu.clarin.sru.client.SRUExplainResponse; 28 28 29 29 … … 53 53 54 54 @Override 55 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,56 FCSTestHandler handler)throws SRUClientException {55 public FCSTestResult perform(FCSTestContext context, SRUClient client) 56 throws SRUClientException { 57 57 SRUExplainRequest req = context.createExplainRequest(); 58 client.explain(req, handler); 59 return handler.getDiagnosticCount() == 0 ? makeSuccess() 58 SRUExplainResponse res = client.explain(req); 59 return res.getDiagnosticsCount() == 0 60 ? makeSuccess() 60 61 : makeWarningUnexpectedDiagnostics(); 61 62 } -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestExplain2.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUExplainRequest; 27 import eu.clarin.sru.client.SRUSimpleClient;28 27 29 28 … … 53 52 54 53 @Override 55 public FCSTestResult perform(FCSTestContext context, SRUSimpleClient client, 56 FCSTestHandler handler) throws SRUClientException { 54 public FCSTestResult perform(FCSTestContext context, SRUClient client) throws SRUClientException { 57 55 SRUExplainRequest req = context.createExplainRequest(); 58 56 req.setExtraRequestData(SRUExplainRequest.X_MALFORMED_OPERATION, … … 60 58 req.setExtraRequestData(SRUExplainRequest.X_MALFORMED_VERSION, 61 59 SRUExplainRequest.MALFORMED_OMIT); 62 client.explain(req , handler);60 client.explain(req); 63 61 return makeSuccess(); 64 62 } -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestExplain3.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUExplainRequest; 27 import eu.clarin.sru.client.SRUSimpleClient;28 27 29 28 @FCSTestCase(priority=1020, profiles = { … … 52 51 53 52 @Override 54 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,55 FCSTestHandler handler)throws SRUClientException {53 public FCSTestResult perform(FCSTestContext context, SRUClient client) 54 throws SRUClientException { 56 55 SRUExplainRequest req = context.createExplainRequest(); 57 56 req.setExtraRequestData(SRUExplainRequest.X_MALFORMED_VERSION, 58 57 SRUExplainRequest.MALFORMED_OMIT); 59 client.explain(req , handler);58 client.explain(req); 60 59 return makeSuccess(); 61 60 } -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestExplain4.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUExplainRequest; 27 import eu.clarin.sru.client.SRUSimpleClient;28 27 29 28 @FCSTestCase(priority=1040, profiles = { … … 52 51 53 52 @Override 54 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,55 FCSTestHandler handler)throws SRUClientException {53 public FCSTestResult perform(FCSTestContext context, SRUClient client) 54 throws SRUClientException { 56 55 SRUExplainRequest req = context.createExplainRequest(); 57 56 req.setExtraRequestData(SRUExplainRequest.X_MALFORMED_OPERATION, 58 57 SRUExplainRequest.MALFORMED_OMIT); 59 client.explain(req , handler);58 client.explain(req); 60 59 return makeSuccess(); 61 60 } -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestExplain5.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUExplainRequest; 27 import eu.clarin.sru.client.SRU SimpleClient;27 import eu.clarin.sru.client.SRUExplainResponse; 28 28 29 29 @FCSTestCase(priority=1050, profiles = { … … 52 52 53 53 @Override 54 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,55 FCSTestHandler handler)throws SRUClientException {54 public FCSTestResult perform(FCSTestContext context, SRUClient client) 55 throws SRUClientException { 56 56 SRUExplainRequest req = context.createExplainRequest(); 57 57 req.setExtraRequestData(SRUExplainRequest.X_MALFORMED_VERSION, 58 58 "9.9"); 59 client.explain(req, handler);60 return handler.findDiagnostic("info:srw/diagnostic/1/5")59 SRUExplainResponse res = client.explain(req); 60 return findDiagnostic(res, "info:srw/diagnostic/1/5") 61 61 ? makeSuccess() 62 62 : makeErrorNoDiagnostic("info:srw/diagnostic/1/5"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan1.java
r7167 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUScanRequest; 27 import eu.clarin.sru.client.SRUS impleClient;27 import eu.clarin.sru.client.SRUScanResponse; 28 28 29 29 @FCSTestCase(priority=2000, profiles = { … … 51 51 52 52 @Override 53 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,54 FCSTestHandler handler)throws SRUClientException {53 public FCSTestResult perform(FCSTestContext context, SRUClient client) 54 throws SRUClientException { 55 55 SRUScanRequest req = context.createScanRequest(); 56 56 req.setExtraRequestData(SRUScanRequest.X_MALFORMED_SCAN_CLAUSE, 57 57 SRUScanRequest.MALFORMED_OMIT); 58 client.scan(req, handler);59 return handler.findDiagnostic("info:srw/diagnostic/1/7")58 SRUScanResponse res = client.scan(req); 59 return findDiagnostic(res, "info:srw/diagnostic/1/7") 60 60 ? makeSuccess() 61 61 : makeErrorNoDiagnostic("info:srw/diagnostic/1/7"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan2.java
r7116 r7196 17 17 package eu.clarin.fcs.tester.tests; 18 18 19 import java.util.List;20 21 19 import eu.clarin.fcs.tester.FCSTest; 22 20 import eu.clarin.fcs.tester.FCSTestCase; 23 21 import eu.clarin.fcs.tester.FCSTestContext; 24 22 import eu.clarin.fcs.tester.FCSTestProfile; 25 import eu.clarin.fcs.tester.FCSTestHandler;26 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 27 25 import eu.clarin.sru.client.SRUClientException; 28 26 import eu.clarin.sru.client.SRUScanRequest; 29 import eu.clarin.sru.client.SRUS impleClient;27 import eu.clarin.sru.client.SRUScanResponse; 30 28 31 29 @FCSTestCase(priority=2010, profiles = { … … 53 51 54 52 @Override 55 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,56 FCSTestHandler handler)throws SRUClientException {53 public FCSTestResult perform(FCSTestContext context, SRUClient client) 54 throws SRUClientException { 57 55 SRUScanRequest req = context.createScanRequest(); 58 56 req.setScanClause("fcs.resource=root"); 59 client.scan(req, handler);57 SRUScanResponse res = client.scan(req); 60 58 61 if ( handler.findDiagnostic("info:srw/diagnostic/1/4")) {59 if (findDiagnostic(res, "info:srw/diagnostic/1/4")) { 62 60 return makeWarning("Endpoint does not support 'scan' operation"); 63 61 } else { 64 if (handler.getDiagnosticCount() == 0) { 65 List<String> terms = handler.getTerms(); 66 if (terms.size() >= 1) { 62 if (res.getDiagnosticsCount() == 0) { 63 if (getTermsCount(res) >= 1) { 67 64 return makeSuccess(); 68 65 } else { -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan3.java
r7116 r7196 17 17 package eu.clarin.fcs.tester.tests; 18 18 19 import java.util.List;20 21 19 import eu.clarin.fcs.tester.FCSTest; 22 20 import eu.clarin.fcs.tester.FCSTestCase; 23 21 import eu.clarin.fcs.tester.FCSTestContext; 24 22 import eu.clarin.fcs.tester.FCSTestProfile; 25 import eu.clarin.fcs.tester.FCSTestHandler;26 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 27 25 import eu.clarin.sru.client.SRUClientException; 28 26 import eu.clarin.sru.client.SRUScanRequest; 29 import eu.clarin.sru.client.SRUS impleClient;27 import eu.clarin.sru.client.SRUScanResponse; 30 28 31 29 @FCSTestCase(priority=2030, profiles = { … … 53 51 54 52 @Override 55 public FCSTestResult perform(FCSTestContext context, SRUSimpleClient client, 56 FCSTestHandler handler) throws SRUClientException { 53 public FCSTestResult perform(FCSTestContext context, SRUClient client) throws SRUClientException { 57 54 SRUScanRequest req = context.createScanRequest(); 58 55 req.setScanClause("fcs.resource=root"); 59 56 req.setMaximumTerms(1); 60 client.scan(req, handler);57 SRUScanResponse res = client.scan(req); 61 58 62 if ( handler.getDiagnosticCount() > 0) {63 if ( handler.findDiagnostic("info:srw/diagnostic/1/4")) {59 if (res.getDiagnosticsCount() > 0) { 60 if (findDiagnostic(res, "info:srw/diagnostic/1/4")) { 64 61 return makeWarning("Endpoint does not support 'scan' operation"); 65 62 } else { … … 67 64 } 68 65 } else { 69 List<String> terms = handler.getTerms();70 if ( terms.size()== 1) {66 int count = getTermsCount(res); 67 if (count == 1) { 71 68 return makeSuccess(); 72 } else if ( terms.size()> 1) {69 } else if (count > 1) { 73 70 return makeWarning("Endpoint did not honor 'maximumTerms' argument"); 74 71 } -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan4.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUScanRequest; 27 import eu.clarin.sru.client.SRUS impleClient;27 import eu.clarin.sru.client.SRUScanResponse; 28 28 29 29 @FCSTestCase(priority=2040, profiles = { … … 53 53 54 54 @Override 55 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,56 FCSTestHandler handler)throws SRUClientException {55 public FCSTestResult perform(FCSTestContext context, SRUClient client) 56 throws SRUClientException { 57 57 SRUScanRequest req = context.createScanRequest(); 58 58 req.setScanClause("fcs.resource=root"); 59 59 req.setExtraRequestData(SRUScanRequest.X_MALFORMED_MAXIMUM_TERMS, 60 60 "invalid"); 61 client.scan(req, handler);62 return handler.findDiagnostic("info:srw/diagnostic/1/6")61 SRUScanResponse res = client.scan(req); 62 return findDiagnostic(res, "info:srw/diagnostic/1/6") 63 63 ? makeSuccess() 64 64 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan5.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUScanRequest; 27 import eu.clarin.sru.client.SRUS impleClient;27 import eu.clarin.sru.client.SRUScanResponse; 28 28 29 29 @FCSTestCase(priority=2050, profiles = { … … 53 53 54 54 @Override 55 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,56 FCSTestHandler handler)throws SRUClientException {55 public FCSTestResult perform(FCSTestContext context, SRUClient client) 56 throws SRUClientException { 57 57 SRUScanRequest req = context.createScanRequest(); 58 58 req.setScanClause("fcs.resource=root"); 59 59 req.setExtraRequestData(SRUScanRequest.X_MALFORMED_RESPONSE_POSITION, 60 60 "invalid"); 61 client.scan(req, handler);62 return handler.findDiagnostic("info:srw/diagnostic/1/6")61 SRUScanResponse res = client.scan(req); 62 return findDiagnostic(res, "info:srw/diagnostic/1/6") 63 63 ? makeSuccess() 64 64 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch1.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 @FCSTestCase(priority=3000, profiles = { … … 54 54 55 55 @Override 56 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,57 FCSTestHandler handler)throws SRUClientException {56 public FCSTestResult perform(FCSTestContext context, SRUClient client) 57 throws SRUClientException { 58 58 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 59 59 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, 60 60 escapeCQL(context.getRandomSearchTerm())); 61 client.searchRetrieve(req, handler);62 return handler.getDiagnosticCount() == 061 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 62 return res.getDiagnosticsCount() == 0 63 63 ? makeSuccess() 64 64 : makeWarningUnexpectedDiagnostics(); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch10.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 @FCSTestCase(priority=3100, profiles = { … … 54 54 55 55 @Override 56 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,57 FCSTestHandler handler)throws SRUClientException {56 public FCSTestResult perform(FCSTestContext context, SRUClient client) 57 throws SRUClientException { 58 58 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 59 59 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, 60 60 escapeCQL(context.getRandomSearchTerm())); 61 61 req.setStartRecord(Integer.MAX_VALUE); 62 client.searchRetrieve(req, handler);63 return handler.findDiagnostic("info:srw/diagnostic/1/61")62 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 63 return findDiagnostic(res, "info:srw/diagnostic/1/61") 64 64 ? makeSuccess() 65 65 : makeErrorNoDiagnostic("info:srw/diagnostic/1/61"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch11.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 @FCSTestCase(priority=3200, profiles = { … … 54 54 55 55 @Override 56 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,57 FCSTestHandler handler)throws SRUClientException {56 public FCSTestResult perform(FCSTestContext context, SRUClient client) 57 throws SRUClientException { 58 58 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 59 59 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, 60 60 escapeCQL(context.getUnicodeSearchTerm())); 61 client.searchRetrieve(req, handler);62 return handler.getDiagnosticCount() == 061 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 62 return res.getDiagnosticsCount() == 0 63 63 ? makeSuccess() 64 64 : makeWarningUnexpectedDiagnostics(); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch12.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 import eu.clarin.fcs.tester.FCSTestHandler.SurrogateDiagnostic;25 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 26 25 import eu.clarin.sru.client.SRUClientConstants; 27 26 import eu.clarin.sru.client.SRUClientException; 28 27 import eu.clarin.sru.client.SRUDiagnostic; 28 import eu.clarin.sru.client.SRURecord; 29 29 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 30 import eu.clarin.sru.client.SRUS impleClient;30 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 31 31 import eu.clarin.sru.client.SRUSurrogateRecordData; 32 32 import eu.clarin.sru.client.fcs.DataView; … … 67 67 68 68 @Override 69 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,70 FCSTestHandler handler)throws SRUClientException {69 public FCSTestResult perform(FCSTestContext context, SRUClient client) 70 throws SRUClientException { 71 71 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 72 72 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, … … 74 74 req.setRecordSchema(FCS_RECORD_SCHEMA); 75 75 req.setMaximumRecords(5); 76 client.searchRetrieve(req, handler);77 if ( handler.findDiagnostic("info:srw/diagnostic/1/66")) {76 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 77 if (findDiagnostic(res, "info:srw/diagnostic/1/66")) { 78 78 return makeError("Endpoint claims to not " + 79 79 "support FCS record schema (" + FCS_RECORD_SCHEMA + ")"); 80 } else if ( handler.getRecordCount() == 0) {80 } else if (res.getRecordsCount() == 0) { 81 81 return makeWarning("Endpoint has no results " +"" + 82 82 "for search term \"" + context.getUserSearchTerm() + 83 83 "\". Please supply a different search term."); 84 84 } else { 85 for (FCSTestHandler.Record record : handler.getRecords()) { 86 String recordSchema = record.getData().getRecordSchema(); 87 if (SRUSurrogateRecordData.RECORD_SCHEMA.equals(recordSchema)) { 88 final SurrogateDiagnostic data = 89 (SurrogateDiagnostic) record.getData(); 85 for (SRURecord record : res.getRecords()) { 86 if (record.isRecordSchema(SRUSurrogateRecordData.RECORD_SCHEMA)) { 87 final SRUSurrogateRecordData data = 88 (SRUSurrogateRecordData) record.getRecordData(); 90 89 final SRUDiagnostic d = data.getDiagnostic(); 91 90 92 if ( data.isDiagnostic("info:srw/diagnostic/1/67")) {91 if (isDiagnostic(d, "info:srw/diagnostic/1/67")) { 93 92 return makeError("Endpoint cannot render record in " + 94 93 "CLARIN-FCS record format and returned " + 95 94 "surrogate diagnostic \"info:srw/diagnostic/1/67\" " + 96 95 "instead."); 97 } else if ( data.isDiagnostic("info:clarin/sru/diagnostic/2")) {96 } else if (isDiagnostic(d, "info:clarin/sru/diagnostic/2")) { 98 97 return makeError("Endpoint sent one or more records with record " + 99 98 "schema of '" + d.getDetails() + … … 115 114 return makeError(sb.toString()); 116 115 } 117 } else if ( FCS_RECORD_SCHEMA.equals(recordSchema)) {116 } else if (record.isRecordSchema(FCS_RECORD_SCHEMA)) { 118 117 final LegacyClarinFCSRecordData data = 119 (LegacyClarinFCSRecordData) record.get Data();118 (LegacyClarinFCSRecordData) record.getRecordData(); 120 119 final Resource resource = data.getResource(); 121 120 boolean foundKwic = false; … … 145 144 } 146 145 } 147 if ( handler.getRecordCount() > req.getMaximumRecords()) {146 if (res.getRecordsCount() > req.getMaximumRecords()) { 148 147 return makeError("Endpoint did not honor upper requested limit for " + 149 148 "\"maximumRecords\" parameter (up to " + 150 149 req.getMaximumRecords() + 151 150 " records where requested and endpoint delivered " + 152 handler.getRecordCount() + " results)");151 res.getRecordsCount() + " results)"); 153 152 } 154 153 return makeSuccess(); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch13.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 import eu.clarin.fcs.tester.FCSTestHandler.SurrogateDiagnostic;25 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 26 25 import eu.clarin.sru.client.SRUClientException; 27 26 import eu.clarin.sru.client.SRUDiagnostic; 27 import eu.clarin.sru.client.SRURecord; 28 28 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 29 import eu.clarin.sru.client.SRUS impleClient;29 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 30 30 import eu.clarin.sru.client.SRUSurrogateRecordData; 31 31 import eu.clarin.sru.client.fcs.ClarinFCSConstants; … … 66 66 67 67 @Override 68 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,69 FCSTestHandler handler)throws SRUClientException {68 public FCSTestResult perform(FCSTestContext context, SRUClient client) 69 throws SRUClientException { 70 70 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 71 71 req.setQuery(ClarinFCSConstants.QUERY_TYPE_CQL, … … 73 73 req.setRecordSchema(FCS_RECORD_SCHEMA); 74 74 req.setMaximumRecords(5); 75 client.searchRetrieve(req, handler);76 if ( handler.findDiagnostic("info:srw/diagnostic/1/66")) {75 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 76 if (findDiagnostic(res, "info:srw/diagnostic/1/66")) { 77 77 return makeError("Endpoint claims to not " + 78 78 "support FCS record schema (" + FCS_RECORD_SCHEMA + ")"); 79 } else if ( handler.getRecordCount() == 0) {79 } else if (res.getRecordsCount() == 0) { 80 80 return makeWarning("Endpoint has no results " +"" + 81 81 "for search term \"" + context.getUserSearchTerm() + 82 82 "\". Please supply a different search term."); 83 83 } else { 84 for (FCSTestHandler.Record record : handler.getRecords()) { 85 String recordSchema = record.getData().getRecordSchema(); 86 if (SRUSurrogateRecordData.RECORD_SCHEMA.equals(recordSchema)) { 87 final SurrogateDiagnostic data = 88 (SurrogateDiagnostic) record.getData(); 84 for (SRURecord record : res.getRecords()) { 85 if (record.isRecordSchema(SRUSurrogateRecordData.RECORD_SCHEMA)) { 86 final SRUSurrogateRecordData data = 87 (SRUSurrogateRecordData) record.getRecordData(); 89 88 final SRUDiagnostic d = data.getDiagnostic(); 90 89 91 if ( data.isDiagnostic("info:srw/diagnostic/1/67")) {90 if (isDiagnostic(d, "info:srw/diagnostic/1/67")) { 92 91 return makeError("Endpoint cannot render record in " + 93 92 "CLARIN-FCS record format and returned " + 94 93 "surrogate diagnostic \"info:srw/diagnostic/1/67\" " + 95 94 "instead."); 96 } else if ( data.isDiagnostic("info:clarin/sru/diagnostic/2")) {95 } else if (isDiagnostic(d, "info:clarin/sru/diagnostic/2")) { 97 96 return makeError("Endpoint sent one or more records with record " + 98 97 "schema of '" + d.getDetails() + … … 114 113 return makeError(sb.toString()); 115 114 } 116 } else if ( FCS_RECORD_SCHEMA.equals(recordSchema)) {115 } else if (record.isRecordSchema(FCS_RECORD_SCHEMA)) { 117 116 final ClarinFCSRecordData data = 118 (ClarinFCSRecordData) record.get Data();117 (ClarinFCSRecordData) record.getRecordData(); 119 118 final Resource resource = data.getResource(); 120 119 boolean foundHits = false; … … 144 143 } 145 144 } 146 if ( handler.getRecordCount() > req.getMaximumRecords()) {145 if (res.getRecordsCount() > req.getMaximumRecords()) { 147 146 return makeError("Endpoint did not honor upper requested limit for " + 148 147 "\"maximumRecords\" parameter (up to " + 149 148 req.getMaximumRecords() + 150 149 " records where requested and endpoint delivered " + 151 handler.getRecordCount() + " results)");150 res.getRecordsCount() + " results)"); 152 151 } 153 152 return makeSuccess(); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch14.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 import eu.clarin.fcs.tester.FCSTestHandler.SurrogateDiagnostic;25 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 26 25 import eu.clarin.sru.client.SRUClientException; 27 26 import eu.clarin.sru.client.SRUDiagnostic; 27 import eu.clarin.sru.client.SRURecord; 28 28 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 29 import eu.clarin.sru.client.SRUS impleClient;29 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 30 30 import eu.clarin.sru.client.SRUSurrogateRecordData; 31 31 import eu.clarin.sru.client.fcs.ClarinFCSConstants; … … 66 66 67 67 @Override 68 public FCSTestResult perform(FCSTestContext context, SRUSimpleClient client, 69 FCSTestHandler handler) throws SRUClientException { 68 public FCSTestResult perform(FCSTestContext context, SRUClient client) 69 throws SRUClientException { 70 if (!context.hasProperty(FCSTestContext.PROP_SUPPORTS_ADV)) { 71 return makeSkipped(); 72 } 70 73 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 71 74 req.setQuery(ClarinFCSConstants.QUERY_TYPE_FCS, … … 73 76 req.setRecordSchema(FCS_RECORD_SCHEMA); 74 77 req.setMaximumRecords(5); 75 client.searchRetrieve(req, handler);76 if ( handler.findDiagnostic("info:srw/diagnostic/1/66")) {78 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 79 if (findDiagnostic(res, "info:srw/diagnostic/1/66")) { 77 80 return makeError("Endpoint claims to not " + 78 81 "support FCS record schema (" + FCS_RECORD_SCHEMA + ")"); 79 } else if ( handler.getRecordCount() == 0) {82 } else if (res.getRecordsCount() == 0) { 80 83 return makeWarning("Endpoint has no results " +"" + 81 84 "for search term \"" + context.getUserSearchTerm() + 82 85 "\". Please supply a different search term."); 83 86 } else { 84 for (FCSTestHandler.Record record : handler.getRecords()) { 85 String recordSchema = record.getData().getRecordSchema(); 86 if (SRUSurrogateRecordData.RECORD_SCHEMA.equals(recordSchema)) { 87 final SurrogateDiagnostic data = 88 (SurrogateDiagnostic) record.getData(); 87 for (SRURecord record : res.getRecords()) { 88 if (record.isRecordSchema(SRUSurrogateRecordData.RECORD_SCHEMA)) { 89 final SRUSurrogateRecordData data = 90 (SRUSurrogateRecordData) record.getRecordData(); 89 91 final SRUDiagnostic d = data.getDiagnostic(); 90 92 91 if ( data.isDiagnostic("info:srw/diagnostic/1/67")) {93 if (isDiagnostic(d, "info:srw/diagnostic/1/67")) { 92 94 return makeError("Endpoint cannot render record in " + 93 95 "CLARIN-FCS record format and returned " + 94 96 "surrogate diagnostic \"info:srw/diagnostic/1/67\" " + 95 97 "instead."); 96 } else if ( data.isDiagnostic("info:clarin/sru/diagnostic/2")) {98 } else if (isDiagnostic(d, "info:clarin/sru/diagnostic/2")) { 97 99 return makeError("Endpoint sent one or more records with record " + 98 100 "schema of '" + d.getDetails() + … … 114 116 return makeError(sb.toString()); 115 117 } 116 } else if ( FCS_RECORD_SCHEMA.equals(recordSchema)) {118 } else if (record.isRecordSchema(FCS_RECORD_SCHEMA)) { 117 119 final ClarinFCSRecordData data = 118 (ClarinFCSRecordData) record.get Data();120 (ClarinFCSRecordData) record.getRecordData(); 119 121 final Resource resource = data.getResource(); 120 122 boolean foundHits = false; … … 154 156 } 155 157 } 156 if ( handler.getRecordCount() > req.getMaximumRecords()) {158 if (res.getRecordsCount() > req.getMaximumRecords()) { 157 159 return makeError("Endpoint did not honor upper requested limit for " + 158 160 "\"maximumRecords\" parameter (up to " + 159 161 req.getMaximumRecords() + 160 162 " records where requested and endpoint delivered " + 161 handler.getRecordCount() + " results)");163 res.getRecordsCount() + " results)"); 162 164 } 163 165 return makeSuccess(); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch2.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 import eu.clarin.sru.client.fcs.ClarinFCSRecordData; 30 30 … … 56 56 57 57 @Override 58 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,59 FCSTestHandler handler)throws SRUClientException {58 public FCSTestResult perform(FCSTestContext context, SRUClient client) 59 throws SRUClientException { 60 60 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 61 61 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, 62 62 escapeCQL(context.getRandomSearchTerm())); 63 63 req.setRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA); 64 client.searchRetrieve(req, handler);65 return handler.getDiagnosticCount() == 064 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 65 return res.getDiagnosticsCount() == 0 66 66 ? makeSuccess() 67 67 : makeWarningUnexpectedDiagnostics(); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch3.java
r7167 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientException; 26 26 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 27 import eu.clarin.sru.client.SRUS impleClient;27 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 28 28 29 29 … … 52 52 53 53 @Override 54 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,55 FCSTestHandler handler)throws SRUClientException {54 public FCSTestResult perform(FCSTestContext context, SRUClient client) 55 throws SRUClientException { 56 56 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 57 57 req.setExtraRequestData(SRUSearchRetrieveRequest.X_MALFORMED_QUERY, 58 58 SRUSearchRetrieveRequest.MALFORMED_OMIT); 59 client.searchRetrieve(req, handler);60 return handler.findDiagnostic("info:srw/diagnostic/1/7")59 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 60 return findDiagnostic(res, "info:srw/diagnostic/1/7") 61 61 ? makeSuccess() 62 62 : makeErrorNoDiagnostic("info:srw/diagnostic/1/7"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch4.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 … … 55 55 56 56 @Override 57 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,58 FCSTestHandler handler)throws SRUClientException {57 public FCSTestResult perform(FCSTestContext context, SRUClient client) 58 throws SRUClientException { 59 59 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 60 60 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, … … 62 62 req.setExtraRequestData( 63 63 SRUSearchRetrieveRequest.X_MALFORMED_RECORD_XML_ESCAPING, "invalid"); 64 client.searchRetrieve(req, handler);65 return handler.findDiagnostic("info:srw/diagnostic/1/71")64 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 65 return findDiagnostic(res, "info:srw/diagnostic/1/71") 66 66 ? makeSuccess() 67 67 : makeErrorNoDiagnostic("info:srw/diagnostic/1/71"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch5.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 … … 55 55 56 56 @Override 57 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,58 FCSTestHandler handler)throws SRUClientException {57 public FCSTestResult perform(FCSTestContext context, SRUClient client) 58 throws SRUClientException { 59 59 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 60 60 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, … … 62 62 req.setExtraRequestData( 63 63 SRUSearchRetrieveRequest.X_MALFORMED_START_RECORD, "invalid"); 64 client.searchRetrieve(req, handler);65 return handler.findDiagnostic("info:srw/diagnostic/1/6")64 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 65 return findDiagnostic(res, "info:srw/diagnostic/1/6") 66 66 ? makeSuccess() 67 67 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch6.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 … … 55 55 56 56 @Override 57 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,58 FCSTestHandler handler)throws SRUClientException {57 public FCSTestResult perform(FCSTestContext context, SRUClient client) 58 throws SRUClientException { 59 59 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 60 60 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, … … 62 62 req.setExtraRequestData( 63 63 SRUSearchRetrieveRequest.X_MALFORMED_START_RECORD, "0"); 64 client.searchRetrieve(req, handler);65 return handler.findDiagnostic("info:srw/diagnostic/1/6")64 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 65 return findDiagnostic(res, "info:srw/diagnostic/1/6") 66 66 ? makeSuccess() 67 67 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch7.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 … … 55 55 56 56 @Override 57 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,58 FCSTestHandler handler)throws SRUClientException {57 public FCSTestResult perform(FCSTestContext context, SRUClient client) 58 throws SRUClientException { 59 59 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 60 60 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, … … 62 62 req.setExtraRequestData( 63 63 SRUSearchRetrieveRequest.X_MALFORMED_MAXIMUM_RECORDS, "invalid"); 64 client.searchRetrieve(req, handler);65 return handler.findDiagnostic("info:srw/diagnostic/1/6")64 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 65 return findDiagnostic(res, "info:srw/diagnostic/1/6") 66 66 ? makeSuccess() 67 67 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch8.java
r7172 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 … … 55 55 56 56 @Override 57 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,58 FCSTestHandler handler)throws SRUClientException {57 public FCSTestResult perform(FCSTestContext context, SRUClient client) 58 throws SRUClientException { 59 59 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 60 60 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, … … 62 62 req.setExtraRequestData( 63 63 SRUSearchRetrieveRequest.X_MALFORMED_MAXIMUM_RECORDS, "-1"); 64 client.searchRetrieve(req, handler);65 return handler.findDiagnostic("info:srw/diagnostic/1/6")64 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 65 return findDiagnostic(res, "info:srw/diagnostic/1/6") 66 66 ? makeSuccess() 67 67 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestSearch9.java
r7116 r7196 21 21 import eu.clarin.fcs.tester.FCSTestContext; 22 22 import eu.clarin.fcs.tester.FCSTestProfile; 23 import eu.clarin.fcs.tester.FCSTestHandler;24 23 import eu.clarin.fcs.tester.FCSTestResult; 24 import eu.clarin.sru.client.SRUClient; 25 25 import eu.clarin.sru.client.SRUClientConstants; 26 26 import eu.clarin.sru.client.SRUClientException; 27 27 import eu.clarin.sru.client.SRUSearchRetrieveRequest; 28 import eu.clarin.sru.client.SRUS impleClient;28 import eu.clarin.sru.client.SRUSearchRetrieveResponse; 29 29 30 30 … … 55 55 56 56 @Override 57 public FCSTestResult perform(FCSTestContext context, SRU SimpleClient client,58 FCSTestHandler handler)throws SRUClientException {57 public FCSTestResult perform(FCSTestContext context, SRUClient client) 58 throws SRUClientException { 59 59 SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest(); 60 60 req.setQuery(SRUClientConstants.QUERY_TYPE_CQL, 61 61 "\"" + context.getRandomSearchTerm() + "\" ="); 62 client.searchRetrieve(req, handler);63 return handler.findDiagnostic("info:srw/diagnostic/1/10")62 SRUSearchRetrieveResponse res = client.searchRetrieve(req); 63 return findDiagnostic(res, "info:srw/diagnostic/1/10") 64 64 ? makeSuccess() 65 65 : makeErrorNoDiagnostic("info:srw/diagnostic/1/10"); -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/ui/ResultsView.java
r7116 r7196 52 52 private static final Resource ICON_ERROR = 53 53 new ThemeResource("icons/result_error.png"); 54 private static final Resource ICON_SKIPPED = 55 new ThemeResource("icons/weather_clouds.png"); 54 56 private static final DateTimeFormatter dateFmt = 55 57 DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss"); … … 64 66 int count_warning = 0; 65 67 int count_error = 0; 68 int count_skipped = 0; 66 69 for (FCSTestResult result : results) { 67 70 switch (result.getCode()) { … … 74 77 case ERROR: 75 78 count_error++; 79 break; 80 case SKIPPED: 81 count_skipped++; 76 82 break; 77 83 } // switch … … 115 121 116 122 final Label resultsOverview = new Label( 117 String.format("Success: %d, Warnings: %d, Errors: %d ",118 count_success, count_warning, count_error ));123 String.format("Success: %d, Warnings: %d, Errors: %d, Skipped: %d", 124 count_success, count_warning, count_error, count_skipped)); 119 125 addComponent(resultsOverview); 120 126 … … 221 227 case ERROR: 222 228 return ICON_ERROR; 229 case SKIPPED: 230 return ICON_SKIPPED; 223 231 } 224 232 } -
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/ui/TesterUI.java
r7116 r7196 196 196 profileCombo.addItem(PROFILE_AUTODETECT); 197 197 profileCombo.setItemCaption(PROFILE_AUTODETECT, "Auto detect"); 198 profileCombo.addItem(PROFILE_FCS_LEGACY); 199 profileCombo.setItemCaption(PROFILE_FCS_LEGACY, "Legacy FCS"); 200 profileCombo.addItem(PROFILE_FCS_1_0); 201 profileCombo.setItemCaption(PROFILE_FCS_1_0, "CLARIN-FCS 1.0"); 198 202 profileCombo.addItem(PROFILE_FCS_2_0); 199 203 profileCombo.setItemCaption(PROFILE_FCS_2_0, "CLARIN-FCS 2.0"); 200 profileCombo.addItem(PROFILE_FCS_1_0);201 profileCombo.setItemCaption(PROFILE_FCS_1_0, "CLARIN-FCS 1.0");202 profileCombo.addItem(PROFILE_FCS_LEGACY);203 profileCombo.setItemCaption(PROFILE_FCS_LEGACY, "Legacy FCS");204 204 profileCombo.select(PROFILE_AUTODETECT); 205 205 profileCombo.setNullSelectionAllowed(false);
Note: See TracChangeset
for help on using the changeset viewer.