X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=4a452fc59a08e707aee76186d31d6ed2067ae4ca;hb=1432ff1d713d989e9750c78fc8674b66e7494356;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..4a452fc 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);
@@ -18,12 +37,22 @@ describe("Check pazpar2 search", function () {
     });
 
     it("run search query", function () {
-        $("input#mkwsQuery").val("freebsd");
-        expect($("input#mkwsQuery").val()).toMatch(/^freebsd$/);
+	var search_query = "freebsd"; // short hit counter with some paging
 
-        setTimeout(function () {
-            $("input#mkwsButton").trigger("click");
-        }, 3 * 1000);
+        $("input#mkwsQuery").val(search_query);
+	debug("set search query: " + search_query)
+        expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
+
+	// wait for service proxy auth
+	waitsFor(function () {
+            return mkws.service_proxy_auth;
+        }, "SP auth done", 10 * 1000);
+
+        runs(function () {
+	    debug("Click on submit button");
+            var click = $("input#mkwsButton").trigger("click");
+	    expect(click.length == 1).toBe(true);
+        })
     });
 });
 
@@ -53,79 +82,34 @@ 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
-        var expected_hits = 116; //
-        var j_time = 0;
-        var j_hits = 0;
-
-        function found(time, none) {
-            setTimeout(function () {
-                j_time = time;
-                hits = get_hit_counter();
+        var expected_hits = 116; // at least expected hit counter
 
-                // debug("found: " + found);
-                if (none) {
-                    expect(hits < 0).toBeTruthy();
-                } else {
-                    j_hits = hits;
-                }
-
-                debug("mkws pager found records: '" + hits + "'");
-                debug("time state: " + j_time);
-
-                expect(time >= 0).toBeTruthy();
-            }, time * 1000);
-        }
-
-        runs(function () {
-            // check hit counter after N seconds
-            found(0, true);
-            found(3);
-            found(6);
-            found(8);
-            found(max_time);
-        });
+        var hits = 0;
 
         waitsFor(function () {
-            return j_time == max_time ? true : false;
-        }, "The Value should be 20 seconds", max_time * 1000);
+	    hits = get_hit_counter();
 
+            return hits >= expected_hits;
+        }, "Expect N hits in x seconds", max_time * 1000);
 
-        runs(function () {
-            expect($("#mkwsPager").length == 1).toBe(true);
-        })
 
         runs(function () {
-            expect(j_time <= max_time).toBeTruthy();
-            expect(j_hits).toBeGreaterThan(expected_hits);
+	    debug("mkws pager found records: '" + hits + "'");
+            expect($("#mkwsPager").length == 1).toBe(true);
+            expect(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 +127,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 +153,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 +171,7 @@ describe("Check pazpar2 hit counter", function () {
         });
     });
 
-    it("Show record author", function () {
+    it("show record author", function () {
         show_record();
     });
 });
@@ -199,7 +183,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");