Changeset 7172 for FCSEndpointTester


Ignore:
Timestamp:
03/22/18 21:04:12 (6 years ago)
Author:
Oliver Schonefeld
Message:
  • add Test for advanced search
  • add escapeCQL and escapeFCS methods
Location:
FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSTest.java

    r7116 r7172  
    3838            SRUSimpleClient client, FCSTestHandler handler)
    3939            throws SRUClientException;
     40
     41
     42    protected String escapeCQL(String q) {
     43        if (q.contains(" ")) {
     44            return "\"" + q + "\"";
     45        } else {
     46            return q;
     47        }
     48    }
     49
     50   
     51    protected String escapeFCS(String q) {
     52        StringBuilder sb = new StringBuilder();
     53        sb.append("\"");
     54        for (int i = 0; i < q.length(); i++) {
     55            final char ch = q.charAt(i);
     56            switch (ch) {
     57            case '\\':
     58                sb.append("\\\\");
     59                break;
     60            case '\'':
     61                sb.append("\\'");
     62                break;
     63            default:
     64                sb.append(ch);
     65            }
     66        }
     67        sb.append("\"");
     68        return sb.toString();
     69    }
    4070
    4171

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

    r7116 r7172  
    5858        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    5959        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    60                 context.getRandomSearchTerm());
     60                escapeCQL(context.getRandomSearchTerm()));
    6161        client.searchRetrieve(req, handler);
    6262        return handler.getDiagnosticCount() == 0

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

    r7116 r7172  
    5858        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    5959        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    60                 context.getRandomSearchTerm());
     60                escapeCQL(context.getRandomSearchTerm()));
    6161        req.setStartRecord(Integer.MAX_VALUE);
    6262        client.searchRetrieve(req, handler);

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

    r7116 r7172  
    5858        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    5959        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    60                 context.getUnicodeSearchTerm());
     60                escapeCQL(context.getUnicodeSearchTerm()));
    6161        client.searchRetrieve(req, handler);
    6262        return handler.getDiagnosticCount() == 0

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

    r7116 r7172  
    7171        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    7272        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    73                 context.getUserSearchTerm());
     73                escapeCQL(context.getUserSearchTerm()));
    7474        req.setRecordSchema(FCS_RECORD_SCHEMA);
    7575        req.setMaximumRecords(5);

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

    r7168 r7172  
    2424import eu.clarin.fcs.tester.FCSTestHandler.SurrogateDiagnostic;
    2525import eu.clarin.fcs.tester.FCSTestResult;
    26 import eu.clarin.sru.client.SRUClientConstants;
    2726import eu.clarin.sru.client.SRUClientException;
    2827import eu.clarin.sru.client.SRUDiagnostic;
    … …  
    3029import eu.clarin.sru.client.SRUSimpleClient;
    3130import eu.clarin.sru.client.SRUSurrogateRecordData;
     31import eu.clarin.sru.client.fcs.ClarinFCSConstants;
    3232import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
    3333import eu.clarin.sru.client.fcs.DataView;
    … …  
    6969            FCSTestHandler handler) throws SRUClientException {
    7070        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    71         req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    72                 context.getUserSearchTerm());
     71        req.setQuery(ClarinFCSConstants.QUERY_TYPE_CQL,
     72                escapeCQL(context.getUserSearchTerm()));
    7373        req.setRecordSchema(FCS_RECORD_SCHEMA);
    7474        req.setMaximumRecords(5);

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

    r7116 r7172  
    6060        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    6161        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    62                 context.getRandomSearchTerm());
     62                escapeCQL(context.getRandomSearchTerm()));
    6363        req.setRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA);
    6464        client.searchRetrieve(req, handler);

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

    r7116 r7172  
    5959        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    6060        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    61                 context.getRandomSearchTerm());
     61                escapeCQL(context.getRandomSearchTerm()));
    6262        req.setExtraRequestData(
    6363                SRUSearchRetrieveRequest.X_MALFORMED_RECORD_XML_ESCAPING, "invalid");

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

    r7116 r7172  
    5959        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    6060        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    61                 context.getRandomSearchTerm());
     61                escapeCQL(context.getRandomSearchTerm()));
    6262        req.setExtraRequestData(
    6363                SRUSearchRetrieveRequest.X_MALFORMED_START_RECORD, "invalid");

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

    r7116 r7172  
    5959        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    6060        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    61                 context.getRandomSearchTerm());
     61                escapeCQL(context.getRandomSearchTerm()));
    6262        req.setExtraRequestData(
    6363                SRUSearchRetrieveRequest.X_MALFORMED_START_RECORD, "0");

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

    r7116 r7172  
    5959        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    6060        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    61                 context.getRandomSearchTerm());
     61                escapeCQL(context.getRandomSearchTerm()));
    6262        req.setExtraRequestData(
    6363                SRUSearchRetrieveRequest.X_MALFORMED_MAXIMUM_RECORDS, "invalid");

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

    r7116 r7172  
    5959        SRUSearchRetrieveRequest req = context.createSearchRetrieveRequest();
    6060        req.setQuery(SRUClientConstants.QUERY_TYPE_CQL,
    61                 context.getRandomSearchTerm());
     61                escapeCQL(context.getRandomSearchTerm()));
    6262        req.setExtraRequestData(
    6363                SRUSearchRetrieveRequest.X_MALFORMED_MAXIMUM_RECORDS, "-1");
Note: See TracChangeset for help on using the changeset viewer.