Changeset 7198

Timestamp:

10/11/18 12:18:08 (6 years ago)

Author:

Oliver Schonefeld

Message:

• remove unused code
• remove unnecessary code

Location:

FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester

Files:

• FCSTest.java (modified) (3 diffs)
• tests/TestScan2.java (modified) (1 diff)
• tests/TestScan3.java (modified) (1 diff)

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

@@ -17 +17 @@
 package eu.clarin.fcs.tester;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.LogRecord;
@@ -27 +26 @@
 import eu.clarin.sru.client.SRUScanResponse;
 import eu.clarin.sru.client.SRUSearchRetrieveResponse;
-import eu.clarin.sru.client.SRUTerm;
 
 
@@ -106 +104 @@
 
 
-//    protected int getDiagnosticCount(SRUExplainResponse res) {
-//        return doGetDiagnosticCount(res.getDiagnostics());
-//    }
-//
-//
-//    protected int getDiagnosticCount(SRUScanResponse res) {
-//        return doGetDiagnosticCount(res.getDiagnostics());
-//    }
-//
-//
-//    protected int getDiagnosticCount(SRUSearchRetrieveResponse res) {
-//        return doGetDiagnosticCount(res.getDiagnostics());
-//    }
-//
-//
-//    private int doGetDiagnosticCount(List<SRUDiagnostic> diagnostics) {
-//        return diagnostics != null ? diagnostics.size() : 0;
-//    }
-
-    protected int getTermsCount(SRUScanResponse res) {
-        return res.getTerms() != null ? res.getTerms().size() : 1;
-    }
-
-    protected List<SRUTerm> getTerms(SRUScanResponse res) {
-        if (res.getTerms() != null) {
-            return res.getTerms();
-        } else {
-           return Collections.emptyList(); 
-        }
-    }
-
-
     protected boolean isDiagnostic(SRUDiagnostic d, String uri) {
         return uri.equals(d.getURI());

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

@@ -61 +61 @@
         } else {
             if (res.getDiagnosticsCount() == 0) {
-                if (getTermsCount(res) >= 1) {
+                if (res.getTermsCount() >= 1) {
                     return makeSuccess();
                 } else {

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

@@ -64 +64 @@
             }
         } else {
-            int count = getTermsCount(res);
+            int count = res.getTermsCount();
             if (count == 1) {
                 return makeSuccess();