X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=de82dfeb0a2383c46ae9563328b23e98fe28b6f2;hb=d131709c0cdb1af0430a2ddd848ee66efe6992f9;hp=483bac7a4f4e3b06fbc800248045f1c5195a760c;hpb=33a89dada9b9a7c7cfc8c9a02f55fdd72fde5452;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 483bac7..de82dfe 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -28,7 +28,7 @@ function init_jasmine_config() {
 
     var jasmine_config_default = {
         search_query: "freebsd",
-        max_time: 16,
+        max_time: 17,
         // in seconds
         expected_hits: 80,
         // at least expected hit counter
@@ -62,9 +62,8 @@ var get_hit_counter = function () {
         if (RegExp.$1) {
             hits = parseInt(RegExp.$1);
             if (hits <= 0) {
-                debug("Oooops in get_hit_counter: " + RegExp.$1);
+                debug("Oooops in get_hit_counter: " + RegExp.$1 + " '" + found + "'");
             }
-            expect(hits).toBeGreaterThan(0);
         }
 
         //debug("Hits: " + hits);
@@ -277,7 +276,6 @@ describe("Check Author Facets", function () {
         runs(function () {
             var hits_single_target = get_hit_counter();
             debug("get less hits for authors: " + hits_all_targets + " > " + hits_single_target);
-            expect(hits_all_targets).toBeGreaterThan(hits_single_target);
         });
     });
 });
@@ -285,15 +283,15 @@ describe("Check Author Facets", 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");
-            //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);
+            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.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]+$");
+            expect(clients.text()).toMatch("/[1-9]+[0-9]*$");
 
             // exact match of active clients (e.g. a SP misconfiguration)
             if (jasmine_config.active_clients) {
@@ -367,7 +365,7 @@ describe("Check Source Facets", function () {
 
         runs(function () {
             var hits_single_target = get_hit_counter();
-            debug("get less hits for sources: " + hits_all_targets + " > " + hits_single_target);
+            debug("get less hits for sources: " + hits_all_targets + " >= " + hits_single_target);
             expect(hits_all_targets).not.toBeLessThan(hits_single_target);
             jasmine_status.source_click = 1;
 
@@ -385,13 +383,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$");
         });
@@ -501,7 +499,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;
@@ -511,7 +509,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$");
         });