X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-pazpar2.js;h=9ae28d3b1c7732f03b18adef4b10d90f22cbacad;hb=63d1cf8722e05136466950be0f85f88b8e4fc491;hp=361415216afc7ea52c185a0e27ee136ac5bc21d7;hpb=d7fb47f1750f9f75010428c9bb45a56c49c3e23e;p=mkws-moved-to-github.git diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 3614152..9ae28d3 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -9,11 +9,15 @@ var debug = function (text) { mkws.log("Jasmine: " + text) } -// Define empty jasmine_config for simple applications that don't define it. + // Define empty jasmine_config for simple applications that don't define it. if (jasmine_config == null || typeof jasmine_config != 'object') { var jasmine_config = {}; } +var jasmine_status = { + source_click: 0 +}; + /* check config for jasmine test * * you can override the default values in the config @@ -57,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); } @@ -75,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 @@ -96,7 +104,7 @@ describe("Check MOTD before search", function () { describe("Check pazpar2 search", function () { it("pazpar2 was successfully initialized", function () { - expect(mkws_config.error).toBe(undefined); + expect(mkws.config.error).toBe(undefined); }); it("validate HTML id's", function () { @@ -113,7 +121,7 @@ describe("Check pazpar2 search", function () { debug("set search query: " + search_query) expect($("input.mkwsQuery").val()).toMatch("^" + search_query + "$"); - if (mkws_config.use_service_proxy) { + if (mkws.config.use_service_proxy) { // wait for service proxy auth waitsFor(function () { return mkws.authenticated; @@ -203,33 +211,35 @@ describe("Check Termlist", function () { expect(termlist.length).toBe(1); waitsFor(function () { - return $("div.mkwsFacetSources").length == 1 ? true : false; + return $("div.mkwsFacet[data-mkws-facet='xtargets']").length == 1 ? true : false; }, "check for facet sources", 4 * jasmine_config.second); // everything displayed? runs(function () { - var sources = $("div.mkwsFacetSources"); + var sources = $("div.mkwsFacet[data-mkws-facet='xtargets']"); debug("Termlist sources success: " + sources.length); expect(sources.length).toBe(1); - var subjects = $("div.mkwsFacetSubjects"); + var subjects = $("div.mkwsFacet[data-mkws-facet='subject']"); expect(subjects.length).toBe(1); - var authors = $("div.mkwsFacetAuthors"); + var authors = $("div.mkwsFacet[data-mkws-facet='author']"); expect(authors.length).toBe(1); }); waitsFor(function () { - return $("div.mkwsFacetAuthors div.term").length >= 2 ? true : false; + return $("div.mkwsFacet[data-mkws-facet='author'] div.term").length >= 2 ? true : false; }, "At least one author link displayed", 4 * jasmine_config.second); runs(function () { - expect($("div.mkwsFacetAuthors div.term").length).toBeGreaterThan(1); + 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) { + if (mkws.config.disable_facet_authors_search) { debug("Facets: ignore limit search for authors"); return; } @@ -239,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.mkwsFacetAuthors 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.mkwsFacetAuthors 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.mkwsFacetAuthors div.term:nth-child(" + author_number + ") a").text()); - $("div.mkwsFacetAuthors 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(); @@ -267,33 +280,73 @@ describe("Check Termlist", function () { expect(hits_all_targets).toBeGreaterThan(hits_single_target); }); }); +}); + +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); + + runs(function () { + 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) + 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 () { @@ -307,13 +360,16 @@ 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 () { var hits_single_target = get_hit_counter(); 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; $(".mkwsPager").unbind("DOMNodeInserted DOMNodeRemoved propertychange"); }); @@ -323,15 +379,19 @@ describe("Check Termlist", function () { describe("Check record list", function () { it("check for single active client", function () { + if (!jasmine_status.source_click) { + debug("skip clients check due missing source click"); + return; + } + 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$"); }); @@ -362,7 +422,6 @@ describe("Show record", function () { waitsFor(function () { var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") > div.details"); //debug("poprecord: " + (show ? show.length : -1) + " " + $("div.mkwsRecords div.record").text()); - return show != null && show.length ? true : false; }, "wait some miliseconds to show up a record", 2 * jasmine_config.second); @@ -436,8 +495,13 @@ describe("Check status client counter", function () { var time = get_time(); it("check status clients", function () { + if (!jasmine_status.source_click) { + debug("skip clients check due missing source click"); + return; + } + 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; @@ -447,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$"); });