X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=9ae28d3b1c7732f03b18adef4b10d90f22cbacad;hb=63d1cf8722e05136466950be0f85f88b8e4fc491;hp=67c769c13e11ce1ef0126403589c7b16873efa71;hpb=98c6db1241eb0d9ce652f8a50182a0d30dd9504f;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 67c769c..9ae28d3 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -61,6 +61,9 @@ var get_hit_counter = function () {
 
         if (RegExp.$1) {
             hits = parseInt(RegExp.$1);
+            if (hits <= 0) {
+                debug("Oooops in get_hit_counter: " + RegExp.$1);
+            }
             expect(hits).toBeGreaterThan(0);
         }
 
@@ -79,7 +82,8 @@ describe("Init jasmine config", function () {
     });
 });
 
-describe("Check MOTD before search", function () {
+//disabled
+xdescribe("Check MOTD before search", function () {
     // Check that the MOTD has been moved into its container, and
     // is visible before the search.
     // the mkwsMOTD div was originally inside a testMOTD div, which should
@@ -231,7 +235,9 @@ describe("Check Termlist", function () {
             expect($("div.mkwsFacet[data-mkws-facet='author'] div.term").length).toBeGreaterThan(1);
         });
     });
+});
 
+describe("Check Author Facets", function () {
     it("limit search to first author", function () {
         if (mkws.config.disable_facet_authors_search) {
             debug("Facets: ignore limit search for authors");
@@ -243,27 +249,30 @@ describe("Check Termlist", function () {
         // do not click on author with numbers, e.g.: "Bower, James M. Beeman, David, 1938-"
         // do not click on author names without a comma, e.g.: "Joe Barbara"
         // because searching on such authors won't find anything.
-        var terms = $("div.mkwsFacet[data-mkws-facet='author'] div.term a");
-        for (var i = 0; i < terms.length; i++) {
-            var term = $(terms[i]).text();
-            if (term.match(/[0-9].+[0-9]/i) || !term.match(/,/)) {
-                debug("ignore author facet: " + term);
-                author_number++;
-            } else {
-                break;
+        runs(function () {
+            var terms = $("div.mkwsFacet[data-mkws-facet='author'] div.term a");
+            for (var i = 0; i < terms.length; i++) {
+                var term = $(terms[i]).text();
+                if (term.match(/[0-9].+[0-9]/i) || !term.match(/,/)) {
+                    debug("ignore author facet: " + term);
+                    author_number++;
+                } else {
+                    break;
+                }
+            }
+            if ($("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").text().length == 0) {
+                debug("No good authors found. Not clicking on the bad ones");
+                return;
             }
-        }
-        if ($("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").text().length == 0) {
-            debug("No good authors found. Not clicking on the bad ones");
-            return;
-        }
 
-        debug("Clicking on author (" + author_number + ") " + $("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").text());
-        $("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").trigger("click");
+            debug("Clicking on author (" + author_number + ") " + $("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").text());
+            $("div.mkwsFacet[data-mkws-facet='author'] div.term:nth-child(" + author_number + ") a").trigger("click");
+        });
 
         waitsFor(function () {
-            return get_hit_counter() < hits_all_targets ? true : false;
-        }, "Limited author search for less than " + hits_all_targets + " hits", 6 * jasmine_config.second);
+            var hits_single_target = get_hit_counter();
+            return hits_single_target > 0 && hits_single_target < hits_all_targets ? true : false;
+        }, "Limited author search for less than " + hits_all_targets + " hits", 4.5 * jasmine_config.second);
 
         runs(function () {
             var hits_single_target = get_hit_counter();
@@ -271,53 +280,73 @@ describe("Check Termlist", function () {
             expect(hits_all_targets).toBeGreaterThan(hits_single_target);
         });
     });
+});
 
-    it("check for active clients", function () {
+describe("Check active clients author", function () {
+    it("check for active clients after limited author search", function () {
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/[1-9]+[0-9]+$");
         }, "wait for Active clients: x/y", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/[1-9]+[0-9]+$");
 
-            // exact match of active clients (e.g. a SP misconfiguration)            
+            // exact match of active clients (e.g. a SP misconfiguration)
             if (jasmine_config.active_clients) {
                 debug("check for " + jasmine_config.active_clients + " active connections");
                 expect(clients.text()).toMatch(" [0-9]+/" + jasmine_config.active_clients + "$");
             }
         });
     });
+});
 
+describe("Check Source Facets", function () {
     it("limit search to first source", function () {
         var hits_all_targets = get_hit_counter();
         var source_number = 2; // 2=first source
+        // wait for a stat response
+        var waitcount = 0;
         // do not click on wikipedia link - no author or subject facets possible
-        var terms = $("div.mkwsFacetSources div.term a");
-        for (var i = 0; i < terms.length; i++) {
-            var term = $(terms[i]).text();
-            if (term.match(/wikipedia/i)) {
-                debug("ignore source facet: " + term);
-                source_number++;
-            } else {
-                break;
+        var link = "div.mkwsFacet[data-mkws-facet='xtargets'] div.term a";
+
+        // wait for a visible source link in facets
+        waitsFor(function () {
+            var terms = $(link);
+            return terms && terms.length > 0;
+        }, "wait for source facets after author search", 5 * jasmine_config.second);
+
+
+        runs(function () {
+            var terms = $(link);
+            for (var i = 0; i < terms.length; i++) {
+                var term = $(terms[i]).text();
+                debug("check for good source: " + term);
+
+                if (term.match(/wikipedia/i)) {
+                    debug("ignore source facet: " + term);
+                    source_number++;
+                } else {
+                    break;
+                }
             }
-        }
-        if ($("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").text().length == 0) {
-            debug("No good source found. Not clicking on the bad ones");
-            return;
-        }
+            debug("Source counter: " + terms.length + ", select: " + (source_number - 1));
 
-        $("div.mkwsFacetSources div.term:nth-child(" + source_number + ") a").trigger("click");
+            if ($("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").text().length == 0) {
+                debug("No good source found. Not clicking on the bad ones");
+                return;
+            }
 
-        // wait for a stat response
-        var waitcount = 0;
-        $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
-            waitcount++;
-            debug("DOM wait for stat: " + waitcount);
+            debug("click on source link nth-child(): " + source_number);
+            $("div.mkwsFacet[data-mkws-facet='xtargets'] div.term:nth-child(" + source_number + ") a").trigger("click");
+
+            $(".mkwsPager").bind("DOMNodeInserted DOMNodeRemoved propertychange", function () {
+                waitcount++;
+                debug("DOM wait for stat: " + waitcount);
+            });
         });
 
         waitsFor(function () {
@@ -331,7 +360,9 @@ describe("Check Termlist", function () {
         // Note: it may happens that limited source search returns the same number of hits
         // as before. Thats not really an error, but unfortunate
         waitsFor(function () {
-            return waitcount >= 2 && get_hit_counter() <= hits_all_targets ? true : false;
+            var hits_single_target = get_hit_counter();
+
+            return waitcount >= 2 && hits_single_target > 0 && hits_single_target <= hits_all_targets ? true : false;
         }, "Limited source search for less than " + hits_all_targets + " hits", 5 * jasmine_config.second);
 
         runs(function () {
@@ -354,13 +385,13 @@ describe("Check record list", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/1$");
         }, "wait for Active clients: x/1", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/1$");
         });
@@ -470,7 +501,7 @@ describe("Check status client counter", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("clients: " + clients.text());
             if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
@@ -480,7 +511,7 @@ describe("Check status client counter", function () {
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("0/1$");
         });