Test Result

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ext01-wrt-tests/application-privilege/testrunner.js b/tct-ext01-wrt-tests/application-privilege/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ext01-wrt-tests/application-privilege/testrunner.js +++ b/tct-ext01-wrt-tests/application-privilege/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

"; + sumdata += ""; + $.each(Sets, function (key, val){ + sumdata += ""; + sumdata += ""; + sumdata += ""; + sumdata += ""; + sumdata += ""; + }); + sumdata += "
TestSet Total Pass Fail Block
" + key+ " " + val.TOTAL + " " + val.PASS + " " + val.FAIL + " " + val.BLOCK + "
"; + } + return sumdata; }, - autoTest: function () { - index = -1; - this.setAutomode(true); - this.doTest(); + getBrowseInfo: function () { + var failList = passList = blockList = notrunList = ""; + function createTestList(tc, color, ind) { + var mtag = (tc.execution_type === "manual") ? "(M)" : ""; + return "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

"; + } + Sets = {}; + $.each(Tests, function (ind ,val) { + if (this.set === null) + this.set = "default"; + if (typeof Sets[this.set] === "undefined") + Sets[this.set] = newSummary(); + Sets[this.set][this.result]++; + Sets[this.set]["TOTAL"]++; + if (this.result == "FAIL") + failList += createTestList(this, "red", ind); + if (this.result == "PASS") + passList += createTestList(this, "green", ind); + if (this.result == "BLOCK") + blockList += createTestList(this, "orange", ind); + if (this.result == "NOTRUN") + notrunList += createTestList(this, "black", ind); + }); + var data = ""; + if (notrunList) + data += "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

"; + data += ""; + return data; }, - TestCase: function() { + TestCase: function () { return { id: null, test_script_entry: null, execution_type: "manual", result: "NOTRUN", purpose: "", + set: null, pre_condition: "", onload_delay: 0, steps: "", @@ -242,89 +351,89 @@ var master_runner = new TestRunner(); master_runner.start = function (ui) { function filter(xml, self) { - $(xml).find("testcase").each(function() { - var v = $(this).attr('execution_type'); - if (parms.execution_type && v != parms.execution_type - && $.inArray(v, parms.execution_type) < 0) { - $(this).remove(); - return; - } - v = $(this).attr('priority'); - if (parms.priority && v != parms.priority - && $.inArray(v, parms.priority) < 0){ - $(this).remove(); - return; - } - var test = self.TestCase(); - test.id = $(this).attr("id"); - test.execution_type = $(this).attr("execution_type"); - test.test_script_entry = $(this).find("test_script_entry").text(); - test.purpose = $(this).attr("purpose"); - test.pre_condition = $(this).find("pre_condition").text(); - test.onload_delay = $(this).attr("onload_delay"); - test.result = "NOTRUN"; - test.data = this; - self.addTest(test); - }); - } - - function getParms() { - var parms = {}; - var items = location.search.substring(1).split('&'); - for ( var i = 0, max = items.length; i < max; i++) { - var pos = items[i].indexOf('='); - if (pos > 0) { - var key = items[i].substring(0, pos); - var val = items[i].substring(pos + 1); - if (!parms[key]) { - var rawVal = decodeURI(val); - if (rawVal.indexOf(',') < 0) - parms[key] = rawVal; - else - parms[key] = rawVal.split(','); + var set_ind = 0; + var manuals = []; + $(xml).find("set").each(function () { + var setname = $(this).attr("name"); + if (!setname) + setname = "set" + set_ind; + $(this).find("testcase").each(function () { + var v = $(this).attr('execution_type'); + if (self.options.execution_type && v != self.options.execution_type + && $.inArray(v, self.options.execution_type) < 0) { + $(this).remove(); + return; } - } else - parms[items[i]] = 1; - } - if (!parms.testsuite) - parms.testsuite = 'tests.xml'; - return parms; + v = $(this).attr('priority'); + if (self.options.priority && v != self.options.priority + && $.inArray(v, self.options.priority) < 0){ + $(this).remove(); + return; + } + var test = self.TestCase(); + test.id = $(this).attr("id"); + test.execution_type = $(this).attr("execution_type"); + test.test_script_entry = $(this).find("test_script_entry").text(); + test.purpose = $(this).attr("purpose"); + test.pre_condition = $(this).find("pre_condition").text(); + test.onload_delay = $(this).attr("onload_delay"); + test.result = "NOTRUN"; + test.set = setname; + test.data = this; + if (test.execution_type === "auto") + self.addTest(test); + else + manuals.push(test); + }); + set_ind++; + }); + self.addTest(manuals); } var self = this; ui.bind(self); - var parms = getParms(); - $.get(parms.testsuite, null, function (xml) { - self.internal.xmldoc = xml; - filter(xml, self); - self.sumInit(); - self.ui.updateList(); - if (parms.hasOwnProperty("autorun")) - self.autoTest(); - }, "xml"); + $.get(self.options.testsuite, null, function (xml) { + self.internal.xmldoc = xml; + filter(xml, self); + self.sumInit(); + setTimeout(function () { + self.ui.browse(); + setTimeout(function () { + if (self.options.autorun) + self.runAll(); + }, 2000); + }, 100); + }, "xml"); }; master_runner.doTest = function () { - var self = this, tc; - self.goNext(); - while ((tc = self.getTest())) { - if (tc.execution_type != 'auto') { - self.goNext(); - continue; - } - self.ui.updateTestInfo(self.testinfo()); - self.ui.runTest(self.getTestCase()); + var self = this, tc = null; + while (self.goNext()) { + tc = self.getTest(); + if (!tc || tc.execution_type === "manual") + break; + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); + return; + } + if (self.options.autorun) { + self.submitResult(); + close_window(); return; } - self.ui.updateList(); - this.setAutomode(false); - setTimeout(function () {self.submitResult();}, 2000); + this.ui.updateView(VIEWFLAGS.del("batch")); + if (!tc) { + setTimeout(function () {self.ui.browse();}, 500); + return; + } + this.ui.updateTest(); }; master_runner.report = function (result, log) { var tc = this.getTest(); + if (!tc) return; var oldresult = tc.result; - this.sumUpdate(oldresult, result); + this.sumUpdate(oldresult, result, tc.set); tc.result = result; $(tc.data).find('result_info').remove(); $(tc.data).attr('result', result); @@ -333,56 +442,14 @@ "" + new Date() + "" + escape_html(log) + ""); $(tc.data).append(doc.documentElement); - this.ui.updateResult(result); - this.ui.updateTestInfo(this.testinfo()); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; master_runner.submitResult = function () { var xmldoc = this.internal.xmldoc; - var data = "Test Result"; - data += ""; - data += "

Summary

"; - var failList = $(xmldoc).find("testcase[result='FAIL']"); - var blockList = $(xmldoc).find("testcase[result='BLOCK']"); - var ipassList = $(xmldoc).find("testcase[result='PASS']"); - var ifail, iblock; - data += "

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

"; - data += ""; - $(xmldoc).find("set").each(function (){ - ipass = $(this).find("testcase[result='PASS']").length; - ifail = $(this).find("testcase[result='FAIL']").length; - iblock = $(this).find("testcase[result='BLOCK']").length; - data += ""; - data += ""; - data += ""; - data += ""; - }); - data += "
TestSet Pass Fail Block
" + $(this).attr('name') + " " + ipass + " " + ifail + " " + iblock + "
"; - - function appendList(list, title, color) { - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ext01-wrt-tests/metadata-support/index.html b/tct-ext01-wrt-tests/metadata-support/index.html index 8728bea..4e8f413 100644 --- a/tct-ext01-wrt-tests/metadata-support/index.html +++ b/tct-ext01-wrt-tests/metadata-support/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ext01-wrt-tests/metadata-support/testrunner.js b/tct-ext01-wrt-tests/metadata-support/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ext01-wrt-tests/metadata-support/testrunner.js +++ b/tct-ext01-wrt-tests/metadata-support/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ext01-wrt-tests/setting-install-location-auto/index.html b/tct-ext01-wrt-tests/setting-install-location-auto/index.html index 8728bea..4e8f413 100644 --- a/tct-ext01-wrt-tests/setting-install-location-auto/index.html +++ b/tct-ext01-wrt-tests/setting-install-location-auto/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ext01-wrt-tests/setting-install-location-auto/testrunner.js b/tct-ext01-wrt-tests/setting-install-location-auto/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ext01-wrt-tests/setting-install-location-auto/testrunner.js +++ b/tct-ext01-wrt-tests/setting-install-location-auto/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/dom-events-audio-onerror/index.html b/tct-rt01-wrt-tests/dom-events-audio-onerror/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/dom-events-audio-onerror/index.html +++ b/tct-rt01-wrt-tests/dom-events-audio-onerror/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/dom-events-audio-onerror/testrunner.js b/tct-rt01-wrt-tests/dom-events-audio-onerror/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/dom-events-audio-onerror/testrunner.js +++ b/tct-rt01-wrt-tests/dom-events-audio-onerror/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/dom-events-video-onerror/index.html b/tct-rt01-wrt-tests/dom-events-video-onerror/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/dom-events-video-onerror/index.html +++ b/tct-rt01-wrt-tests/dom-events-video-onerror/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/dom-events-video-onerror/testrunner.js b/tct-rt01-wrt-tests/dom-events-video-onerror/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/dom-events-video-onerror/testrunner.js +++ b/tct-rt01-wrt-tests/dom-events-video-onerror/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/lifecycle-hide-running-app/index.html b/tct-rt01-wrt-tests/lifecycle-hide-running-app/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/lifecycle-hide-running-app/index.html +++ b/tct-rt01-wrt-tests/lifecycle-hide-running-app/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/lifecycle-hide-running-app/testrunner.js b/tct-rt01-wrt-tests/lifecycle-hide-running-app/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/lifecycle-hide-running-app/testrunner.js +++ b/tct-rt01-wrt-tests/lifecycle-hide-running-app/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/lifecycle-load-event/index.html b/tct-rt01-wrt-tests/lifecycle-load-event/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/lifecycle-load-event/index.html +++ b/tct-rt01-wrt-tests/lifecycle-load-event/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/lifecycle-load-event/testrunner.js b/tct-rt01-wrt-tests/lifecycle-load-event/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/lifecycle-load-event/testrunner.js +++ b/tct-rt01-wrt-tests/lifecycle-load-event/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get-false/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-get/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head-false/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-head/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-invalid/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-null/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post-false/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/index.html b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/index.html index 8728bea..4e8f413 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/index.html +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/testrunner.js b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/testrunner.js +++ b/tct-rt01-wrt-tests/other-uri-XMLHttpRequest-post/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-sp01-wrt-tests/protection-decrypt-css/index.html b/tct-sp01-wrt-tests/protection-decrypt-css/index.html index 8728bea..4e8f413 100644 --- a/tct-sp01-wrt-tests/protection-decrypt-css/index.html +++ b/tct-sp01-wrt-tests/protection-decrypt-css/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-sp01-wrt-tests/protection-decrypt-css/testrunner.js b/tct-sp01-wrt-tests/protection-decrypt-css/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-sp01-wrt-tests/protection-decrypt-css/testrunner.js +++ b/tct-sp01-wrt-tests/protection-decrypt-css/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-sp01-wrt-tests/protection-decrypt-html/index.html b/tct-sp01-wrt-tests/protection-decrypt-html/index.html index 8728bea..4e8f413 100644 --- a/tct-sp01-wrt-tests/protection-decrypt-html/index.html +++ b/tct-sp01-wrt-tests/protection-decrypt-html/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-sp01-wrt-tests/protection-decrypt-html/testrunner.js b/tct-sp01-wrt-tests/protection-decrypt-html/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-sp01-wrt-tests/protection-decrypt-html/testrunner.js +++ b/tct-sp01-wrt-tests/protection-decrypt-html/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-sp01-wrt-tests/protection-decrypt-js/index.html b/tct-sp01-wrt-tests/protection-decrypt-js/index.html index 8728bea..4e8f413 100644 --- a/tct-sp01-wrt-tests/protection-decrypt-js/index.html +++ b/tct-sp01-wrt-tests/protection-decrypt-js/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-sp01-wrt-tests/protection-decrypt-js/testrunner.js b/tct-sp01-wrt-tests/protection-decrypt-js/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-sp01-wrt-tests/protection-decrypt-js/testrunner.js +++ b/tct-sp01-wrt-tests/protection-decrypt-js/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-sp01-wrt-tests/storage-cookies-check/index.html b/tct-sp01-wrt-tests/storage-cookies-check/index.html index 8728bea..4e8f413 100644 --- a/tct-sp01-wrt-tests/storage-cookies-check/index.html +++ b/tct-sp01-wrt-tests/storage-cookies-check/index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-sp01-wrt-tests/storage-cookies-check/testrunner.js b/tct-sp01-wrt-tests/storage-cookies-check/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-sp01-wrt-tests/storage-cookies-check/testrunner.js +++ b/tct-sp01-wrt-tests/storage-cookies-check/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-alarm/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-alarm/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-alarm/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-alarm/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-alarm/testrunner.js b/tct-ui01-wrt-tests/multiple-other-alarm/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-alarm/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-alarm/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-application-launch/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-application-launch/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-application-launch/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-application-launch/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-application-launch/testrunner.js b/tct-ui01-wrt-tests/multiple-other-application-launch/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-application-launch/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-application-launch/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-application-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-application-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-application-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-application-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-application-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-application-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-application-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-application-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testrunner.js b/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-bluetooth-admin/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testrunner.js b/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-bluetooth-gap/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testrunner.js b/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-bluetooth-spp/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

TestSet	Total	Pass	Fail	Block
" + key+ "	" + val.TOTAL + "	" + val.PASS + "	" + val.FAIL + "	" + val.BLOCK + "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

TestSet	Pass	Fail	Block
" + $(this).attr('name') + "	" + ipass + "	" + ifail + "	" + iblock + "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-calendar-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-calendar-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-calendar-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-calendar-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-calendar-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-calendar-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-calendar-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-calendar-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-calendar-write/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-calendar-write/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-calendar-write/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-calendar-write/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-calendar-write/testrunner.js b/tct-ui01-wrt-tests/multiple-other-calendar-write/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-calendar-write/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-calendar-write/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-callhistory-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-callhistory-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-callhistory-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-callhistory-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-callhistory-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-callhistory-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-callhistory-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-callhistory-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-callhistory-write/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-callhistory-write/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-callhistory-write/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-callhistory-write/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-callhistory-write/testrunner.js b/tct-ui01-wrt-tests/multiple-other-callhistory-write/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-callhistory-write/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-callhistory-write/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-contact-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-contact-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-contact-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-contact-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-contact-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-contact-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-contact-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-contact-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-contact-write/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-contact-write/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-contact-write/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-contact-write/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-contact-write/testrunner.js b/tct-ui01-wrt-tests/multiple-other-contact-write/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-contact-write/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-contact-write/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-content-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-content-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-content-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-content-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-content-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-content-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-content-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-content-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-content-write/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-content-write/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-content-write/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-content-write/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-content-write/testrunner.js b/tct-ui01-wrt-tests/multiple-other-content-write/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-content-write/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-content-write/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-download/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-download/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-download/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-download/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-download/testrunner.js b/tct-ui01-wrt-tests/multiple-other-download/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-download/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-download/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-filesystem-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-filesystem-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-filesystem-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-filesystem-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-filesystem-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-filesystem-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-filesystem-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-filesystem-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-filesystem-write/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-filesystem-write/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-filesystem-write/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-filesystem-write/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-filesystem-write/testrunner.js b/tct-ui01-wrt-tests/multiple-other-filesystem-write/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-filesystem-write/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-filesystem-write/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-messaging-read/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-messaging-read/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-messaging-read/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-messaging-read/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-messaging-read/testrunner.js b/tct-ui01-wrt-tests/multiple-other-messaging-read/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-messaging-read/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-messaging-read/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-messaging-send/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-messaging-send/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-messaging-send/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-messaging-send/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-messaging-send/testrunner.js b/tct-ui01-wrt-tests/multiple-other-messaging-send/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-messaging-send/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-messaging-send/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-messaging-write/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-messaging-write/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-messaging-write/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-messaging-write/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-messaging-write/testrunner.js b/tct-ui01-wrt-tests/multiple-other-messaging-write/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-messaging-write/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-messaging-write/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-admin/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-nfc-admin/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-admin/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-nfc-admin/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-admin/testrunner.js b/tct-ui01-wrt-tests/multiple-other-nfc-admin/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-admin/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-nfc-admin/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-common/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-nfc-common/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-common/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-nfc-common/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-common/testrunner.js b/tct-ui01-wrt-tests/multiple-other-nfc-common/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-common/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-nfc-common/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testrunner.js b/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-nfc-p2p/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-tag/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-nfc-tag/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-tag/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-nfc-tag/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-nfc-tag/testrunner.js b/tct-ui01-wrt-tests/multiple-other-nfc-tag/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-nfc-tag/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-nfc-tag/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-notification/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-notification/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-notification/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-notification/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-notification/testrunner.js b/tct-ui01-wrt-tests/multiple-other-notification/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-notification/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-notification/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-power/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-power/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-power/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-power/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-power/testrunner.js b/tct-ui01-wrt-tests/multiple-other-power/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-power/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-power/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-systeminfo/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-systeminfo/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-systeminfo/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-systeminfo/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-systeminfo/testrunner.js b/tct-ui01-wrt-tests/multiple-other-systeminfo/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-systeminfo/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-systeminfo/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-systemsetting/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-systemsetting/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-systemsetting/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-systemsetting/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-systemsetting/testrunner.js b/tct-ui01-wrt-tests/multiple-other-systemsetting/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-systemsetting/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-systemsetting/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-time/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-time/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-time/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-time/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-time/testrunner.js b/tct-ui01-wrt-tests/multiple-other-time/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-time/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-time/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "

"; - } - - if (failList.length > 0) - appendList(failList, "Fails", "red"); - - if (blockList.length > 0) - appendList(blockList, "Blocks", "orange"); - - var tdoc = this.ui.getTestfrmDoc(); - tdoc.open("text/html", "replace"); - tdoc.writeln(data); + var contents = (new XMLSerializer()).serializeToString(xmldoc); + if (window.opener) window.opener.postMessage(contents, "*"); }; master_runner.internal = {xmldoc: null}; @@ -401,22 +468,23 @@ if (!next_step || next_step.step != "continue") return false; ui.bind(self); - self.ui.updateTestInfo("Connecting server..."); var f = function () { var p = self.internal.get_json("check_execution_progress"); - if (p) - self.sumInit(parseInt(p.total)); + if (p) self.sumInit(parseInt(p.total)); self.doTest(); }; - self.setAutomode(true); - setTimeout(f, 2000); + self.ui.updateView(VIEWFLAGS.add("batch")); + self.ui.updateView(VIEWFLAGS.del("list")); + setTimeout(f, 1000); return true; }; slave_runner.doTest = function () { var self = this; if (self.internal.stage > 0) { - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); + self.goNext(); + self.ui.updateTest(); return; } var next_step = self.internal.get_json("ask_next_step"); @@ -424,27 +492,28 @@ var task = self.internal.get_json("auto_test_task"); if (task === null) { print_error("ask_test_task", "Fail get task"); - } else if (task.invalid == 0) { + } else if (task.invalid === 0) { print_error("ask_test_task", "Invalid session"); - } else if (task.stop == 0) { + } else if (task.stop === 0) { print_error("ask_test_task", "close window"); - } else if (task.none != 0) { //handle auto test + } else if (task.none !== 0) { //handle auto test var test = self.TestCase(); test.id = task.case_id; test.onload_delay = task.onload_delay; test.test_script_entry = task.entry; + test.execution_type = "auto"; test.purpose = task.purpose; test.pre_condition = task.pre_condition; - self.cleanTests(); self.addTest(test); - self.setTestIndex(0); - self.ui.runTest(self.getTestCase()); + self.goNext(); + self.ui.updateTestInfo(self.testInfo(), null, null); + self.ui.runTest(self.getTestCaseUrl()); return; } else { //handle manual test - self.setAutomode(false); + self.ui.updateView(VIEWFLAGS.del("batch")); self.internal.stage = 1; var mtask = self.internal.get_json("manual_cases"); - if (mtask && mtask.none !=0) { + if (mtask && mtask.none != 0) { self.cleanTests(); for (var i = 0, max = mtask.length; i < max; i++) { var test = self.TestCase(); @@ -453,6 +522,8 @@ test.purpose = mtask[i].purpose; test.pre_condition = mtask[i].pre_condition; test.result = "NOTRUN"; + test.execution_type = "manual"; + test.index = i; var steps = ""; $(mtask[i].steps).each(function () { steps += "Step-" + this.order + "\t: " + this.step_desc + "\n"; @@ -461,8 +532,9 @@ test.steps = steps; self.addTest(test); } - self.ui.updateList(); + self.ui.updateTest(-1); self.sumInit(); + self.ui.browse(); } else close_window(); return; @@ -479,7 +551,6 @@ {"case_id": tc.id, "result": result}); oldresult = tc.result tc.result = result; - this.ui.updateResult(result); } else { this.internal.post_json("commit_result", { "case_id" : tc.id, @@ -488,13 +559,13 @@ "session_id" : this.internal.session_id}); oldresult = "NOTRUN"; } - this.sumUpdate(oldresult, result); - this.ui.updateTestInfo(this.testinfo()); + this.sumUpdate(oldresult, result, null); + if (VIEWFLAGS.has("batch")) result = null; + this.ui.updateTestInfo(null, this.getTestSum(false), result); }; slave_runner.submitResult = function () { $.get(SERVER + "/generate_xml"); - close_window(); }; slave_runner.internal = { @@ -514,32 +585,26 @@ var i_ui = (function () { var testinfo = $("#testinfo").get(0); var frmTest = $("#frmTest").get(0); - var selTestlist = $("#selTestlist").get(0); - var radPass = $("#radPass").get(0); - var radFail = $("#radFail").get(0); + var textTest = $("#textTest").get(0); + var btnPass = $("#btnPass").get(0); + var btnFail = $("#btnFail").get(0); + var btnBlock = $("#btnBlock").get(0); var btnDone = $("#btnDone").get(0); var btnNext = $("#btnNext").get(0); var btnPrev = $("#btnPrev").get(0); var btnRun = $("#btnRun").get(0); - var divNav = $("#navbar").get(0); - var divFoot = $("#footbar").get(0); - var chkBatch = $("#chkBatch").get(0); - var chkManualonly = $("#chkManualonly").get(0); + var divSum = $("#divSum").get(0); + var btnList = $("#btnList").get(0); var runner = null; + var listmode = null; var nextTest = function () { - if (selTestlist.selectedIndex >= (selTestlist.options.length - 1)) - selTestlist.selectedIndex = 0; - else - selTestlist.selectedIndex++; - selectTest.call(selTestlist); + runner.goNext(); + selectTest(); }; var prevTest = function() { - if (selTestlist.selectedIndex <= 0) - selTestlist.selectedIndex = selTestlist.options.length - 1; - else - selTestlist.selectedIndex--; - selectTest.call(selTestlist); + runner.goPrev(); + selectTest(); }; var selectResult = function() { @@ -547,106 +612,118 @@ }; var selectTest = function () { - var opt = this.options[this.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - var result = runner.getTest().result; - if (result == "PASS"){ - radPass.checked = true; - } else if (result == "FAIL"){ - radFail.checked = true; - } else { - radPass.checked = false; - radFail.checked = false; - } frmTest.src = ""; - testinfo.value = runner.testinfo(); + var tc = runner.getTest(); + if (!tc) { + if (runner.testIndex() === -1) + textTest.value = "---Begin---"; + else + textTest.value = "---End---"; + changeColor("NOTRUN"); + return; + } + testinfo.value = runner.testInfo(); + $(divSum).html(runner.getTestSum(false)); + textTest.value = ((tc.execution_type === "manual") ? "(M)" : "") + tc.id; + changeColor(tc.result); }; - var changeOptColor = function (result, opt) { - if (result == "PASS") - $(opt).css("backgroundColor", "greenyellow"); - else if ($.inArray(result, ["FAIL", "BLOCK"]) > -1) - $(opt).css("backgroundColor", "orangered"); - }; + function changeColor(result) { + if (result === "PASS") + $(textTest).css("backgroundColor", "lightgreen"); + else if (result === "FAIL") + $(textTest).css("backgroundColor", "tomato"); + else if (result === "BLOCK") + $(textTest).css("backgroundColor", "yellow"); + else + $(textTest).css("backgroundColor", "white"); + } return { bind: function (r) { var self = this; r.ui = self; runner = r; - $(radPass).on("click", selectResult); - $(radFail).on("click", selectResult); + $(btnPass).on("click", selectResult); + $(btnFail).on("click", selectResult); + $(btnBlock).on("click", selectResult); $(btnNext).on("click", nextTest); $(btnPrev).on("click", prevTest); $(btnRun).on("click", function () { - if (chkBatch.checked && !chkManualonly.checked) - runner.autoTest(); - else { - var opt = selTestlist.options[selTestlist.selectedIndex]; - runner.setTestIndex(parseInt(opt.value)); - self.runTest(runner.getTestCase()); - } + if (VIEWFLAGS.has("list")) { + runner.runAll(); + } else + self.runTest(runner.getTestCaseUrl()); }); - $(frmTest).on("load", function () {runner.load_ready();}); + $(frmTest).on("load", function () {runner.loadReady();}); $(btnDone).on("click", function () { - setTimeout(function () {runner.submitResult();}, 300); - frmTest.src = "";}); - $(chkManualonly).on("click", function () { - chkBatch.disabled = this.checked; - chkBatch.checked = false; - self.updateList(); + runner.submitResult(); + close_window(); + }); + $(btnList).on("click", function () { + frmTest.src = ""; + //self.updateTest(-1); + setTimeout(function () {self.browse();}, 300); }); frmTest.height = $(window).height(); }, + + browse: function () { + var tdoc = frmTest.contentWindow.document; + tdoc.open("text/html", "replace"); + tdoc.writeln(runner.getBrowseInfo()); + var self = this; + $(tdoc).find("section ul li>a").on("click", function (e) { + var ind = parseInt($(this).attr("rel")); + self.updateView(VIEWFLAGS.del("list")); + self.updateTest(ind); + window.scrollTo(0, 0); + e.preventDefault(); + }); + $(divSum).html(runner.getTestSum(true)); + self.updateView(VIEWFLAGS.add("list")); + }, + + updateTest: function (ind) { + if (typeof ind !== "undefined") runner.testIndex(ind); + selectTest(); + }, - setAutotestView: function (autoflag) { - if (autoflag){ - $(divNav).hide(); - $(divFoot).hide(); + updateView: function (flags) { + if (flags & VIEWFLAGS.flags.list) { + $(".listmode").show(); + $(".singlemode").hide(); } else { - $(divNav).show(); - $(divFoot).show(); - frmTest.src = ""; + $(".listmode").hide(); + $(".singlemode").show(); } + if (flags & VIEWFLAGS.flags.batch) + $(".batchmode").hide(); + else + $(".batchmode").show(); }, - getTestfrmDoc: function () { - return frmTest.contentWindow.document; + testComplete: function () { + return runner.checkResult(frmTest.contentWindow.document); }, - + runTest: function (uri) { + if (uri === null) return; if (uri) frmTest.src = uri; + else + runner.loadReady(); + }, - updateList: function (){ - var item; - selTestlist.options.length = 0; - for(var i = 0, max = runner.getTestLength(); i < max; i++){ - var tc = runner.getTest(i); - if (chkManualonly.checked && tc.execution_type=="auto") - continue; - if (tc.id.length > 32) { - var prefix = tc.id.substring(0, 9); - var postfix = tc.id.substring(15); - item = new Option(prefix + " ... " + postfix, i); - } else - item = new Option(tc.id, i); - selTestlist.options.add(item); - changeOptColor(tc.result, item); - } - $(selTestlist).on("change", selectTest); - selectTest.call(selTestlist); - }, - - updateResult: function (result) { - var opt = selTestlist.options[selTestlist.selectedIndex]; - changeOptColor(result, opt); + updateTestInfo: function (info, sum, result) { + if (info !== null) + testinfo.value = info; + if (sum !== null) + $(divSum).html(sum); + if (result !== null) + changeColor(result); }, - - updateTestInfo: function (info) { - testinfo.value = info; - } }; } ()); @@ -672,6 +749,12 @@ master_runner.start(i_ui); } var SERVER = "http://127.0.0.1:8000"; + var VIEWFLAGS = { val: 0, + flags: {list: 1, batch: 2}, + add: function (f) { this.val |= this.flags[f]; return this.val}, + del: function (f) { this.val &= ~this.flags[f]; return this.val}, + has: function (f) { return this.val & this.flags[f];}, + }; $.ajaxSetup({ async: false}); $(window).on("ready", pre_init); })(window); diff --git a/tct-ui01-wrt-tests/multiple-other-tizen/testkit_index.html b/tct-ui01-wrt-tests/multiple-other-tizen/testkit_index.html index 8728bea..4e8f413 100644 --- a/tct-ui01-wrt-tests/multiple-other-tizen/testkit_index.html +++ b/tct-ui01-wrt-tests/multiple-other-tizen/testkit_index.html @@ -1,74 +1,136 @@ -

- - - - Manual-Only + -

- - Pass - Fail - - Batch +

+ + + +

- diff --git a/tct-ui01-wrt-tests/multiple-other-tizen/testrunner.js b/tct-ui01-wrt-tests/multiple-other-tizen/testrunner.js index 6901cbf..ef68fc1 100644 --- a/tct-ui01-wrt-tests/multiple-other-tizen/testrunner.js +++ b/tct-ui01-wrt-tests/multiple-other-tizen/testrunner.js @@ -1,68 +1,128 @@ /* -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -*/ +Copyright (c) 2013 Intel Corporation. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of works must retain the original copyright notice, this list + of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the original copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this work without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Authors: + Wang, Jing +*/ (function (window){ function TestRunner() { this.start = null; - this.submitResult = null; this.ui = null; + this.submitResult = null; this.report = function (result, message) {}; this.doTest = function () {}; - this.internal = {}; } TestRunner.prototype = (function () { var index = -1; - var autoflag = false; var Tests = []; - var sum = {"TOTAL": 0, - "PASS" : 0, - "FAIL" : 0, - "BLOCK" : 0, - "NOTRUN" : 0 - }; - var testContext = { - start_time: null, - prev_uri: "", - uri: "", - sub_index: 0, - onload_delay: 0 - }; + var Sets = {}; + function newSummary() { + return {"TOTAL": 0, + "PASS" : 0, + "FAIL" : 0, + "BLOCK" : 0, + "NOTRUN" : 0}; + } + function newTestContext() { + return {start_time: null, + prev_uri: "", + uri: "", + sub_index: 0, + onload_delay: 0 + }; + } + function getParms () { + var parms = {}; + var items = location.search.substring(1).split('&'); + for ( var i = 0, max = items.length; i < max; i++) { + var pos = items[i].indexOf('='); + if (pos > 0) { + var key = items[i].substring(0, pos); + var val = items[i].substring(pos + 1); + if (!parms[key]) { + var rawVal = decodeURI(val); + if (rawVal.indexOf(',') < 0) + parms[key] = rawVal; + else + parms[key] = rawVal.split(','); + } + } else + parms[items[i]] = 1; + } + if (!parms.testsuite) + parms.testsuite = 'tests.xml'; + return parms; + } + var parms = getParms(); + var sum = newSummary(); + var testContext = newTestContext(); return { constructor: TestRunner, + options: parms, getTestContext: function (field) { return testContext[field]; }, - cleanTests: function () { - Tests = []; - }, - goNext: function () { + if (Tests.length === 0) return false; + if (index >= Tests.length) { + index = -1; + return false; + } index++; + return true; + }, + + goPrev: function () { + if (Tests.length === 0) return false; + if (index < 0) { + index = Tests.length; + return false; + } + index--; + return true; }, - getTestIndex: function () { - return index; + runAll: function () { + testContext = newTestContext(); + this.ui.updateView(VIEWFLAGS.add("batch")); + this.ui.updateView(VIEWFLAGS.del("list")); + this.testIndex(-1); + this.doTest(); + }, + + cleanTests: function () { + Tests = []; }, - setTestIndex: function (ind) { + testIndex: function (ind) { + if (typeof ind === "undefined") + return index; index = ind; }, @@ -73,32 +133,32 @@ }, addTest: function (test) { - Tests.push(test); - }, - - getTestLength: function () { - if (Tests === null) - return 0; - return Tests.length; + if (test instanceof Array) + Tests = Tests.concat(test); + else + Tests.push(test); }, sumInit: function (num) { if (typeof num === "undefined") num = Tests.length; - sum["TOTAL"] = sum["NOTRUN"] = num; - sum["PASS"] = sum["FAIL"] = sum["BLOCK"] = 0; + sum.TOTAL = sum.NOTRUN = num; + sum.PASS = sum.FAIL = sum.BLOCK = 0; }, - sumUpdate: function (oldRes, newRes) { - if (oldRes !== null) + sumUpdate: function (oldRes, newRes, set) { + if (oldRes !== null) { sum[oldRes]--; - if (newRes !== null) + if (set !== null) Sets[set][oldRes]--; + } + if (newRes !== null) { sum[newRes]++; + if (set != null) Sets[set][newRes]++; + } }, - checkResult: function () { + checkResult: function (oTestDoc) { var message = ""; - var oTestDoc = this.ui.getTestfrmDoc(); // Handle sub-index test if (testContext.sub_index > 0) { var oRes = $(oTestDoc).find("table#results"); @@ -106,13 +166,11 @@ return false; var ind = testContext.sub_index - 1; var $n = $(oRes).find('tbody > tr').eq(ind); - if ($n.length > 0) { - var result = $n.children("td:eq(0)").text(); - message = $n.children("td:eq(2)").text(); - if (result) - this.report(result.toUpperCase(), message); - } else - this.report('FAIL', 'Not found test'); + if ($n.length == 0) + return false + var result = $n.children("td:eq(0)").text(); + message = $n.children("td:eq(2)").text(); + this.report(result.toUpperCase(), message); return true; } @@ -136,13 +194,13 @@ return false; }, - testinfo: function () { + testInfo: function (ind) { var info = ""; - for (var n in sum) - info += n + ":" + sum[n] + " "; var tc = this.getTest(); - info += "\n\nTest\t: " + tc.test_script_entry; - info += "\nPurpose\t: " + tc.purpose; + if (!tc) return info; + info += "Test : (" + (index + 1) + "/" + sum.TOTAL + ") "; + info += tc.test_script_entry; + info += "\nPurpose: " + tc.purpose; if (tc.pre_condition) info += "\nPrecondition: " + tc.pre_condition; if (tc.steps) @@ -150,18 +208,12 @@ return info; }, - getTestCase: function (name, ind) { - if (ind === null) - ind = this.getTestIndex(); - var tc = this.getTest(ind); - return tc[name]; - }, - - getTestCase: function () { + getTestCaseUrl: function () { function getUriField(uri, param) { var querys = uri.split("?") if (querys.length <= 1) return ""; + uri = querys[1]; var start = uri.indexOf(param); if (start == -1) return ""; @@ -172,6 +224,7 @@ return uri.substring(start, end); } var tc = this.getTest(); + if (!tc) return null; var delay = tc.onload_delay; if (delay) testContext.onload_delay = parseInt(delay) * 1000; @@ -179,14 +232,17 @@ testContext.onload_delay = 5000; var uri = tc.test_script_entry; + if (typeof this.options.testprefix !== "undefined") { + var pos = uri.indexOf('http://'); + if (pos !== 0) + uri = this.options.testprefix + uri + } var val = getUriField(uri, "value"); - if (val && tc.execution_type == "auto") { // Need sub index in TC + if (val && tc.execution_type == "auto" && VIEWFLAGS.has("batch")) { // Need sub index in TC testContext.sub_index = parseInt(val); testContext.uri = uri.split("?")[0]; - if (testContext.uri == testContext.prev_uri) { - this.load_ready(); + if (testContext.uri == testContext.prev_uri) return ""; - } } else { testContext.uri = uri; testContext.sub_index = 0; @@ -196,14 +252,14 @@ return testContext.uri; }, - load_ready: function () { - if (!autoflag) + loadReady: function () { + if (!VIEWFLAGS.has("batch")) return; - if (!this.checkResult()){ + if (!this.ui.testComplete()){ if (testContext.onload_delay > 0){ var tval = 500; var self = this; - setTimeout(function() {self.load_ready();}, tval); + setTimeout(function() {self.loadReady();}, tval); testContext.onload_delay -= tval; return } @@ -212,25 +268,78 @@ this.doTest(); }, - setAutomode: function (flag) { - if (this.ui) - this.ui.setAutotestView(flag); - autoflag = flag; + getTestSum: function (include_set) { + var sumdata = "

Total:" + sum.TOTAL + + " Pass:" + sum.PASS + + " Fail:" + sum.FAIL + + " Block:" + sum.BLOCK + + " NotRun:" + sum.NOTRUN + + "

"; + if (VIEWFLAGS.has("batch")) { + var tc = this.getTest(); + if (tc) sumdata += "

(#" + index + ") " + tc.id + "

"; + } + + if (include_set) { + sumdata += "

" + mtag + "" + tc.id + "" + "

Notruns

" + notrunList + "

"; + if (failList) + data += "

Fails

" + failList + "

"; + if (blockList) + data += "

Blocks

" + blockList + "

"; + if (passList) + data += "

Passes

" + passList + "

Summary

Total:" + this.getTestLength() - + " Pass:" + ipassList.length - + " Fail:" + failList.length - + " Block:" + blockList.length - + "

"; - - data += "

" + title + "

"; - $(list).each(function() { - var url = $(this).find("test_script_entry").text(); - data += "

" + url + "

"; - }); - data += "