Changeset 7196 for FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan5.java

Timestamp:

10/11/18 12:13:58 (6 years ago)

Author:

Oliver Schonefeld

Message:

• rewrite to use SRUClient instead of SRUSimpleClient
• add Tests for Endpoint Description (FCS 1.0 and FCS 2.0)

File:

• FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan5.java (modified) (2 diffs)

FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/tests/TestScan5.java

@@ -21 +21 @@
 import eu.clarin.fcs.tester.FCSTestContext;
 import eu.clarin.fcs.tester.FCSTestProfile;
-import eu.clarin.fcs.tester.FCSTestHandler;
 import eu.clarin.fcs.tester.FCSTestResult;
+import eu.clarin.sru.client.SRUClient;
 import eu.clarin.sru.client.SRUClientException;
 import eu.clarin.sru.client.SRUScanRequest;
-import eu.clarin.sru.client.SRUSimpleClient;
+import eu.clarin.sru.client.SRUScanResponse;
 
 @FCSTestCase(priority=2050, profiles = {
@@ -53 +53 @@
 
     @Override
-    public FCSTestResult perform(FCSTestContext context, SRUSimpleClient client,
-            FCSTestHandler handler) throws SRUClientException {
+    public FCSTestResult perform(FCSTestContext context, SRUClient client)
+            throws SRUClientException {
         SRUScanRequest req = context.createScanRequest();
         req.setScanClause("fcs.resource=root");
         req.setExtraRequestData(SRUScanRequest.X_MALFORMED_RESPONSE_POSITION,
                 "invalid");
-        client.scan(req, handler);
-        return handler.findDiagnostic("info:srw/diagnostic/1/6")
+        SRUScanResponse res = client.scan(req);
+        return findDiagnostic(res, "info:srw/diagnostic/1/6")
                 ? makeSuccess()
                 : makeErrorNoDiagnostic("info:srw/diagnostic/1/6");