Merge branch '66-refactor-dhrep-online-tests' into 'develop'

fix: fix id counting method

Closes #66

See merge request dariah-de/dariah-de-oai-pmh-services!66

oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java

@@ -37,11 +37,11 @@ public class OAIPMHUtilitiesOnline {
 
   // ## CHANGE SETTINGS BELOW FOR SETTING TEST SCOPE ---------------------------------------------
 
-  public static final String PROPERTIES_FILE = "oaipmh.test.textgridlab-org.properties";
-  // public static final String PROPERTIES_FILE = "oaipmh.test.dev-textgridlab-org.properties";
+  // public static final String PROPERTIES_FILE = "oaipmh.test.textgridlab-org.properties";
+  public static final String PROPERTIES_FILE = "oaipmh.test.dev-textgridlab-org.properties";
 
-  public static final boolean TEST_ALL_PAGES = false;
-  // public static final boolean TEST_ALL_PAGES = true;
+  // public static final boolean TEST_ALL_PAGES = false;
+  public static final boolean TEST_ALL_PAGES = true;
 
   // ## CHANGE SETTINGS ABOVE FOR SETTING TEST SCOPE ---------------------------------------------
 
@@ -347,9 +347,14 @@ public class OAIPMHUtilitiesOnline {
 
         // Test resumption token tags.
         responseString = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
+
+        System.out.println("  ##  RESPONSE" + responseString);
+
         restok = examineTGResumptionTokenTag(responseString, testOccurance, restok,
             recordsExpectedPerRequest, loopCount, threadName);
 
+        System.out.println("  ##  restok: " + restok);
+
         // Test if the header identifiers are sound.
         if (theVerb.equals(VERB_LIST_RECORDS)) {
           examineTGHeader(responseString, recordsExpectedPerRequest);
@@ -492,6 +497,8 @@ public class OAIPMHUtilitiesOnline {
         && !theResponseString.contains("metadataPrefix=\"" + OAI_DC_PREFIX + "\"")
         && !theResponseString.contains(EXPECTED_OAIDC_FORMAT_CONTENT)) {
 
+      System.out.println(theResponseString);
+
       String message = OAI_DC_PREFIX + " needs to deliver content with schema: "
           + EXPECTED_OAIDC_FORMAT_CONTENT + "!";
       assertTrue(message, false);
@@ -501,6 +508,8 @@ public class OAIPMHUtilitiesOnline {
             .contains("metadataPrefix=\"" + EXPECTED_IDIOMMETS_FORMAT_CONTENT + "\"")
         && !theResponseString.contains(EXPECTED_IDIOMMETS_FORMAT_CONTENT)) {
 
+      System.out.println(theResponseString);
+
       String message = OAI_IDIOMMETS_PREFIX + " needs to deliver content with schema: "
           + EXPECTED_IDIOMMETS_FORMAT_CONTENT + "!";
       assertTrue(message, false);
@@ -509,14 +518,12 @@ public class OAIPMHUtilitiesOnline {
         && !theResponseString.contains("metadataPrefix=\"" + OAI_DATACITE_PREFIX + "\"")
         && !theResponseString.contains(EXPECTED_DATACITE_FORMAT_CONTENT)) {
 
+      System.out.println(theResponseString);
+
       String message = OAI_DATACITE_PREFIX + " needs to deliver content with schema: "
           + EXPECTED_DATACITE_FORMAT_CONTENT + "!";
       assertTrue(message, false);
 
-    } else {
-      // DEBUG ONLY!
-      // System.out.println(theResponseString);
-      // DEBUG ONLY!
     }
   }
 
@@ -558,15 +565,16 @@ public class OAIPMHUtilitiesOnline {
     int count = 0;
     // Look for all the header ID tags.
     while (startID != -1) {
-      count++;
       startID = theResponseString.indexOf(HEADER_ID_START_TAG, endID);
       endID = theResponseString.indexOf(HEADER_ID_END_TAG, startID);
-      id = theResponseString.substring(startID + HEADER_ID_START_TAG.length(), endID);
-      idHash.add(id);
+      if (startID != -1) {
+        count++;
+        id = theResponseString.substring(startID + HEADER_ID_START_TAG.length(), endID);
+        idHash.add(id);
+      }
     }
-    // Remove "-1" ID again (and the respective counter).
-    idHash.remove(id);
-    count--;
+
+    System.out.println("\tID hash (" + idHash.size() + "): " + idHash);
 
     // Check for ID count: Hash size (unique IDs!) must be equal to the count of ID headers!
     if (count != idHash.size()) {