X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=996a9548d3911aa81f54b20b5184c8b616ce11d1;hb=fe1c7e888fbbc54b10d62a41f2cddfe523c5194e;hp=a3a9983703812cbb6cc4b8b642026b3231246186;hpb=10c9d385caee5378501d21de063d1f89173c7737;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index a3a9983..996a954 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -4,6 +4,25 @@
  *
  */
 
+var debug = mkws.debug;
+
+var get_hit_counter = function () {
+    if ($("#mkwsPager").length == 0) return -1;
+
+    var found = $("#mkwsPager").text();
+    var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
+    re.exec(found);
+    var hits = -1;
+
+    if (RegExp.$1) {
+        hits = parseInt(RegExp.$1);
+        expect(hits).toBeGreaterThan(0);
+    }
+
+    //debug("Hits: " + hits);
+    return hits;
+}
+
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialize", function () {
         expect(mkws_config.error).toBe(undefined);
@@ -55,28 +74,6 @@ describe("Check pazpar2 navigation", function () {
 
 
 describe("Check pazpar2 hit counter", function () {
-    function get_hit_counter() {
-        if ($("#mkwsPager").length == 0) return -1;
-
-        var found = $("#mkwsPager").text();
-        var re = /found: ([0-9]+)/;
-        re.exec(found);
-        var hits = -1;
-
-        if (RegExp.$1) {
-            hits = parseInt(RegExp.$1);
-            expect(hits).toBeGreaterThan(0);
-        }
-
-        //debug("Hits: " + hits);
-        return hits;
-    }
-
-    function show_record() {
-        var click = $("div#mkwsRecords div.record:nth-child(3) :nth-child(2)").trigger("click");
-        debug("show click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
-    }
 
     it("check running search hit counter", function () {
         var max_time = 10; // in seconds
@@ -126,6 +123,14 @@ describe("Check pazpar2 hit counter", function () {
             expect(j_hits).toBeGreaterThan(expected_hits);
         });
     });
+});
+
+describe("Check Termlist", function () {
+    function show_record() {
+        var click = $("div#mkwsRecords div.record:nth-child(3) :nth-child(2)").trigger("click");
+        debug("show click is success: " + click.length);
+        expect(click.length == 1).toBe(true);
+    }
 
     // show_record();
     it("found Termlist", function () {
@@ -143,7 +148,7 @@ describe("Check pazpar2 hit counter", function () {
         expect(authors.length == 1).toBe(true);
     });
 
-    it("Limit search to first source", function () {
+    it("limit search to first source", function () {
         var hits_all_targets = get_hit_counter();
 
         var click = $("div#mkwsFacetSources div.term:nth-child(2) a").trigger("click");
@@ -169,7 +174,7 @@ describe("Check pazpar2 hit counter", function () {
         });
     });
 
-    it("Limit search to first author", function () {
+    it("limit search to first author", function () {
         var hits_all_targets = get_hit_counter();
 
         var click = $("div#mkwsFacetAuthors div.term:nth-child(2) a").trigger("click");
@@ -187,7 +192,7 @@ describe("Check pazpar2 hit counter", function () {
         });
     });
 
-    it("Show record author", function () {
+    it("show record author", function () {
         show_record();
     });
 });
@@ -199,7 +204,7 @@ describe("Check status client counter", function () {
     }
     var time = get_time();
 
-    it("Limit search to first author", function () {
+    it("check status clients", function () {
 
         waitsFor(function () {
             var clients = $("div#mkwsStat span.clients");