X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=898ae06c2a02c8e1f974d2b26cadd2bdc8ba0bdc;hb=7bcd054bbf692e5eafe62fa72b1fa8fef7c92c51;hp=9a5746febda59c2c7759d93fe12f5138944e0c52;hpb=269c237d92627904e8fc2888524c183567a7a09c;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 9a5746f..898ae06 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -4,36 +4,40 @@
  *
  */
 
-var debug = mkws.debug;
+// get references from mkws.js, lazy evaluation
+var debug = function () {  mkws.debug_level; }
+var debug_level = function () { mkws.debug_function }
 
 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;
+    // not yet here
+    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);
     });
 
     it("validate HTML id's", function () {
-        expect($("input#mkwsQuery").length == 1).toBe(true);
-        expect($("input#mkwsButton").length == 1).toBe(true);
+        expect($("input#mkwsQuery").length).toBe(1);
+        expect($("input#mkwsButton").length).toBe(1);
 
-        expect($("#mkwsNext").length == 1).toBe(false);
-        expect($("#mkwsPrev").length == 1).toBe(false);
+        expect($("#mkwsNext").length).not.toBe(1);
+        expect($("#mkwsPrev").length).not.toBe(1);
     });
 
     it("run search query", function () {
@@ -44,36 +48,41 @@ describe("Check pazpar2 search", function () {
 
         // wait for service proxy auth
         waitsFor(function () {
-            return mkws.service_proxy_auth;
+            return mkws.authenticated;
         }, "SP auth done", 10 * 1000);
 
         runs(function () {
             debug("Click on submit button");
             var click = $("input#mkwsButton").trigger("click");
-            expect(click.length == 1).toBe(true);
+            expect(click.length).toBe(1);
         })
     });
 });
 
 
+/*
+ * This part runs in background. It should be rewritten with
+ * async jasmine functions
+ *
+ */
 describe("Check pazpar2 navigation", function () {
     // Asynchronous part
     it("check running search next/prev", function () {
-        expect($("#mkwsPager").length == 1).toBe(true);
+        expect($("#mkwsPager").length).toBe(1);
 
         function my_click(id, time) {
             setTimeout(function () {
                 debug("trigger click on id: " + id);
                 var click = $(id).trigger("click");
 
-                debug("next click is success: " + click.length);
-                expect(click.length == 1).toBe(true);
+                debug("next/prev: " + id + " click is success: " + click.length);
+                expect(click.length).toBe(1);
             }, time * 1000);
         }
 
         waitsFor(function () {
             return $("div#mkwsPager div:nth-child(2) a").length >= 2 ? true : false;
-        }, "Expect next link 2", 5 * 1000);
+        }, "Expect next link 2", 10 * 1000);
 
         runs(function () {
             // click next/prev after N seconds
@@ -94,71 +103,55 @@ describe("Check pazpar2 navigation", function () {
 
 describe("Check pazpar2 hit counter", function () {
     it("check running search hit counter", function () {
-        var max_time = 10; // in seconds
-        var expected_hits = 116; // at least expected hit counter
+        var max_time = 16; // in seconds
+        var expected_hits = 80; // at least expected hit counter
         var hits = 0;
 
         waitsFor(function () {
             hits = get_hit_counter();
 
-            return hits >= expected_hits;
-        }, "Expect N hits in x seconds", max_time * 1000);
+            return hits > expected_hits;
+        }, "Expect " + expected_hits + " hits", max_time * 1000);
 
 
         runs(function () {
             debug("mkws pager found records: '" + hits + "'");
-            expect($("#mkwsPager").length == 1).toBe(true);
+            expect($("#mkwsPager").length).toBe(1);
             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 () {
         var termlist = $("div#mkwsTermlists");
         debug("Termlist success: " + termlist.length);
-        expect(termlist.length == 1).toBe(true);
+        expect(termlist.length).toBe(1);
 
-        var sources = $("div#mkwsFacetSources");
-        expect(sources.length == 1).toBe(true);
+        waitsFor(function () {
+            return $("div#mkwsFacetSources").length == 1 ? true : false;
+        }, "check for facet sources", 2 * 1000);
 
-        var subjects = $("div#mkwsFacetSubjects");
-        expect(subjects.length == 1).toBe(true);
 
-        var authors = $("div#mkwsFacetAuthors");
-        expect(authors.length == 1).toBe(true);
-    });
-
-    it("limit search to first source", function () {
-        var hits_all_targets = get_hit_counter();
+        // everything displayed?
+        runs(function () {
+            var sources = $("div#mkwsFacetSources");
+            debug("Termlist sources success: " + sources.length);
+            expect(sources.length).toBe(1);
 
-        var click = $("div#mkwsFacetSources div.term:nth-child(2) a").trigger("click");
-        debug("limit source click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
+            var subjects = $("div#mkwsFacetSubjects");
+            expect(subjects.length).toBe(1);
 
-        waitsFor(function () {
-            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/^Source/)) {
-                return true;
-            } else {
-                return false;
-            }
-        }, "Search for source in navi bar", 1000);
+            var authors = $("div#mkwsFacetAuthors");
+            expect(authors.length).toBe(1);
+        });
 
         waitsFor(function () {
-            return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Search for with less hits", 9 * 1000);
+            return $("div#mkwsFacetAuthors div.term").length >= 2 ? true : false;
+        }, "At least one author link displayed", 2 * 1000);
 
         runs(function () {
-            var hits_single_target = get_hit_counter();
-            debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
-            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
+            expect($("div#mkwsFacetAuthors div.term").length).toBeGreaterThan(1);
         });
     });
 
@@ -167,11 +160,11 @@ describe("Check Termlist", function () {
 
         var click = $("div#mkwsFacetAuthors div.term:nth-child(2) a").trigger("click");
         debug("limit author click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
+        expect(click.length).toBe(1);
 
         waitsFor(function () {
             return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Search for with less hits", 9 * 1000);
+        }, "Limited author search for less than " + hits_all_targets + " hits", 8 * 1000);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
@@ -180,37 +173,65 @@ describe("Check Termlist", function () {
         });
     });
 
-    it("show record author", function () {
-        show_record();
-    });
-});
-
-describe("Check status client counter", function () {
-    function get_time() {
-        var date = new Date();
-        return date.getTime();
-    }
-    var time = get_time();
+    it("limit search to first source", function () {
+        var hits_all_targets = get_hit_counter();
+        var source_number = 2; // 2=first source
+        var source_name = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").text();
+        // do not click on wikipedia link - no author or subject facets possible
+        if (source_name.match(/wikipedia/i)) {
+            source_number++;
+        }
 
-    it("check status clients", function () {
+        var click = $("div#mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
+        debug("limit source click " + (source_number - 1) + " is success: " + click.length);
+        expect(click.length).toBe(1);
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
-            if (clients.length == 1 && clients.text() == "0/1") {
+            if ($("div#mkwsNavi").length && $("div#mkwsNavi").text().match(/Source: /)) {
                 return true;
             } else {
                 return false;
             }
+        }, "Search for source in navi bar", 1000);
 
-        }, "wait for status", 4 * 1000);
+        waitsFor(function () {
+            return get_hit_counter() < hits_all_targets ? true : false;
+        }, "Limited source earch for less than " + hits_all_targets + " hits", 9 * 1000);
 
+        runs(function () {
+            var hits_single_target = get_hit_counter();
+            debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
+            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
+        });
     });
-    runs(function () {
-        var clients = $("div#mkwsStat span.clients");
-        debug("span.clients: " + clients.text());
-        expect(clients.text()).toEqual("0/1");
+});
+
+describe("Show record", function () {
+    var record_number = 1; // the Nth record in hit list
+    it("show record author", function () {
+        var click = $("div#mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
+        debug("show record click is success: " + click.length);
+        expect(click.length).toBe(1);
+
+        // wait until the record pops up
+        waitsFor(function () {
+            var show = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div");
+            return show != null && show.length ? true : false;
+        }, "wait some miliseconds to show up a record", 2 * 1000);
+
+        runs(function () {
+            debug("show record pop up");
+            expect($("div#mkwsRecords div.record:nth-child(" + record_number + ") div")).not.toBe(null);
+        });
     });
 
+    it("extract URL", function () {
+        var url = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a").text();
+        debug("extracted URL from record: " + url);
+
+        expect(url).not.toBe(null);
+        expect(url).toMatch(/^http:\/\/[a-z0-9]+\.[0-9a-z].*\//i);
+    });
 });
 
 describe("Check switch menu Records/Targets", function () {
@@ -223,18 +244,19 @@ describe("Check switch menu Records/Targets", function () {
 
     it("switch to target view", function () {
         var click = $("a#mkwsSwitch_targets").trigger("click");
-        debug("target click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
+        debug("target view click is success: " + click.length);
+        expect(click.length).toBe(1);
 
         // now the target table must be visible
         expect($("div#mkwsBytarget").is(":visible")).toBe(true);
-        expect($("div#mkwsResults").is(":visible")).toBe(false);
+        expect($("div#mkwsRecords").is(":visible")).toBe(false);
 
         // wait a half second, to show the target view
         var time = (new Date).getTime();
         waitsFor(function () {
             return (new Date).getTime() - time > 700 ? true : false;
         }, "wait some miliseconds", 1 * 1000);
+
         // look for table header
         runs(function () {
             expect($("div#mkwsBytarget").html()).toMatch(/Target ID/);
@@ -243,13 +265,43 @@ describe("Check switch menu Records/Targets", function () {
 
     it("switch back to record view", function () {
         var click = $("a#mkwsSwitch_records").trigger("click");
-        debug("record click is success: " + click.length);
-        expect(click.length == 1).toBe(true);
+        debug("record view click is success: " + click.length);
+        expect(click.length).toBe(1);
 
         // now the target table must be visible
         expect($("div#mkwsBytarget").is(":visible")).toBe(false);
-        expect($("div#mkwsResults").is(":visible")).toBe(true);
+        expect($("div#mkwsRecords").is(":visible")).toBe(true);
+    });
+});
+
+describe("Check status client counter", function () {
+    function get_time() {
+        var date = new Date();
+        return date.getTime();
+    }
+    var time = get_time();
+
+    it("check status clients", function () {
+        waitsFor(function () {
+            var clients = $("div#mkwsStat span.clients");
+            if (clients.length == 1 && clients.text().match("0/1$")) {
+                return true;
+            } else {
+                return false;
+            }
+
+        }, "wait for Active clients: 0/1", 4 * 1000);
+
+        /*
+        runs(function () {
+            var clients = $("div#mkwsStat span.clients");
+            debug("span.clients: " + clients.text());
+            expect(clients.text()).toEqual("0/1");
+        });
+        */
+
     });
+
 });
 
 /* dummy EOF */