Revision: 16840d34454a
Author: Janne Härkönen <[email protected]>
Date: Tue Jun 21 00:56:46 2011
Log: renamed fullname -> fullName
http://code.google.com/p/robotframework/source/detail?r=16840d34454a
Modified:
/src/robot/webcontent/log.html
/src/robot/webcontent/model.js
/src/robot/webcontent/report.html
/src/robot/webcontent/testdata.js
/utest/webcontent/spec/ParsingSpec.js
=======================================
--- /src/robot/webcontent/log.html Mon Jun 20 13:36:51 2011
+++ /src/robot/webcontent/log.html Tue Jun 21 00:56:46 2011
@@ -159,14 +159,14 @@
onclick="closeElement('${id}');"
style="display: none;">-</div>
<span class="${status.toLowerCase()}">TEST SUITE:</span>
- <a class="name" name="suite_${fullname}"
title="${name}">${name}</a>
+ <a class="name" name="suite_${fullName}"
title="${name}">${name}</a>
</td>
</tr>
<tr>
<td class="suite_children">
<div class="indent" id="${id}_children" style="display: none;">
<table class="metadata" id="${id}_metadata">
- <tr><th>Full Name:</th><td>${fullname}</td></tr>
+ <tr><th>Full Name:</th><td>${fullName}</td></tr>
{{if doc}}
<tr><th>Documentation:</th><td>{{html doc}}</td></tr>
{{/if}}
@@ -202,15 +202,15 @@
onclick="closeElement('${id}');"
style="display: none;">-</div>
<span class="${status.toLowerCase()}">TEST CASE: </span>
- <a class="name" name="test_${fullname}"
- title="${fullname}">${name}</a>
+ <a class="name" name="test_${fullName}"
+ title="${fullName}">${name}</a>
</td>
</tr>
<tr>
<td>
<div class="indent" id="${id}_children" style="display: none;">
<table class="metadata" id="${id}_metadata">
- <tr><th>Full Name:</th><td>${fullname}</td></tr>
+ <tr><th>Full Name:</th><td>${fullName}</td></tr>
{{if doc}}
<tr><th>Documentation:</th><td>{{html doc}}</td></tr>
{{/if}}
=======================================
--- /src/robot/webcontent/model.js Tue Jun 21 00:47:16 2011
+++ /src/robot/webcontent/model.js Tue Jun 21 00:56:46 2011
@@ -15,7 +15,7 @@
function Suite(data) {
var suite = createModelObject(data);
suite.source = data.source;
- suite.fullname = data.parent ? data.parent.fullname + "." +
data.name : data.name;
+ suite.fullName = data.parent ? data.parent.fullName + "." +
data.name : data.name;
setStats(suite, data.statistics);
suite.metadata = data.metadata;
suite.populateKeywords = createIterablePopulator("Keyword");
@@ -84,7 +84,7 @@
}
function findSuiteByName(suite, name) {
- if (suite.fullname == name)
+ if (suite.fullName == name)
return suite;
var subSuites = suite.suites();
for (var i = 0; i < subSuites.length; i++) {
@@ -121,9 +121,9 @@
function Test(data) {
var test = createModelObject(data);
- test.fullname = data.parent.fullname + "." + test.name; // TODO:
is this used?, could be function also
+ test.fullName = data.parent.fullName + "." + test.name; // TODO:
is this used?, could be function also
test.parentName = function () {
- return data.parent.fullname.replace(/\./g, ' . ') + ' . '; //
TODO: duplicate
+ return data.parent.fullName.replace(/\./g, ' . ') + ' . '; //
TODO: duplicate
};
test.timeout = data.timeout;
test.populateKeywords = createIterablePopulator("Keyword");
@@ -143,7 +143,7 @@
var kw = createModelObject(data);
kw.type = data.type;
var parent = data.parent
- var parentPath = (parent.path === undefined) ? parent.fullname :
parent.path;
+ var parentPath = (parent.path === undefined) ? parent.fullName :
parent.path;
kw.path = parentPath + "." + data.index;
kw.arguments = data.args;
kw.populateKeywords = createIterablePopulator("Keyword");
=======================================
--- /src/robot/webcontent/report.html Tue Jun 21 00:05:18 2011
+++ /src/robot/webcontent/report.html Tue Jun 21 00:56:46 2011
@@ -206,7 +206,7 @@
return t1.status == 'FAIL' ? -1 : 1;
if (t1.isCritical != t2.isCritical)
return t1.isCritical ? -1 : 1;
- return t1.fullname < t2.fullname ? -1 : 1;
+ return t1.fullName < t2.fullName ? -1 : 1;
}
function getTestsHavingTag(tag) {
@@ -428,7 +428,7 @@
{{if $item.logURL}}
<tr>
<th>Log Link:</th>
- <td><a href="${$item.logURL}#suite_${fullname}"
title="${fullname}">${$item.logURL}#suite_${fullname} </a></td>
+ <td><a href="${$item.logURL}#suite_${fullName}"
title="${fullName}">${$item.logURL}#suite_${fullName} </a></td>
</tr>
{{/if}}
{{if doc}}
@@ -477,7 +477,7 @@
<script type="text/x-jquery-tmpl" id="testDetailsTableRowTemplate">
<tr class="test_row">
{{if $item.logURL}}
- <td class="col_name"><a href="${$item.logURL}#test_${fullname}"
id="test_${fullname}" title="${fullname}"><span
class="parent_name">${parentName}</span>${name}</a></td>
+ <td class="col_name"><a href="${$item.logURL}#test_${fullName}"
id="test_${fullName}" title="${fullName}"><span
class="parent_name">${parentName}</span>${name}</a></td>
{{else}}
<td class="col_name"><span
class="parent_name">${parentName}</span>${name}</td>
{{/if}}
=======================================
--- /src/robot/webcontent/testdata.js Mon Jun 20 03:29:18 2011
+++ /src/robot/webcontent/testdata.js Tue Jun 21 00:56:46 2011
@@ -204,79 +204,79 @@
return elementsById[id];
}
- function pathToKeyword(fullname) {
+ function pathToKeyword(fullName) {
var root = suite();
- if (fullname.indexOf(root.fullname + ".") != 0) return [];
- return keywordPathTo(fullname + ".", root, [root.id]);
+ if (fullName.indexOf(root.fullName + ".") != 0) return [];
+ return keywordPathTo(fullName + ".", root, [root.id]);
}
- function pathToTest(fullname) {
+ function pathToTest(fullName) {
var root = suite();
- if (fullname.indexOf(root.fullname + ".") != 0) return [];
- return testPathTo(fullname, root, [root.id]);
+ if (fullName.indexOf(root.fullName + ".") != 0) return [];
+ return testPathTo(fullName, root, [root.id]);
}
- function pathToSuite(fullname) {
+ function pathToSuite(fullName) {
var root = suite();
- if (fullname.indexOf(root.fullname) != 0) return [];
- if (fullname == root.fullname) return [root.id];
- return suitePathTo(fullname, root, [root.id]);
+ if (fullName.indexOf(root.fullName) != 0) return [];
+ if (fullName == root.fullName) return [root.id];
+ return suitePathTo(fullName, root, [root.id]);
}
- function keywordPathTo(fullname, current, result) {
- if (fullname == "") return result;
+ function keywordPathTo(fullName, current, result) {
+ if (fullName == "") return result;
for (var i = 0; i < current.numberOfKeywords; i++) {
var kw = current.keyword(i);
- if (fullname.indexOf(kw.path + ".") == 0) {
+ if (fullName.indexOf(kw.path + ".") == 0) {
result.push(kw.id);
- if (fullname == kw.path + ".")
+ if (fullName == kw.path + ".")
return result;
- return keywordPathTo(fullname, kw, result);
+ return keywordPathTo(fullName, kw, result);
}
}
for (var i = 0; i < current.numberOfTests; i++) {
var test = current.test(i);
- if (fullname.indexOf(test.fullname + ".") == 0) {
+ if (fullName.indexOf(test.fullName + ".") == 0) {
result.push(test.id);
- return keywordPathTo(fullname, test, result);
+ return keywordPathTo(fullName, test, result);
}
}
for (var i = 0; i < current.numberOfSuites; i++) {
var suite = current.suite(i);
- if (fullname.indexOf(suite.fullname + ".") == 0) {
+ if (fullName.indexOf(suite.fullName + ".") == 0) {
result.push(suite.id);
- return keywordPathTo(fullname, suite, result);
+ return keywordPathTo(fullName, suite, result);
}
}
}
- function testPathTo(fullname, currentSuite, result) {
+ function testPathTo(fullName, currentSuite, result) {
for (var i = 0; i < currentSuite.numberOfTests; i++) {
var test = currentSuite.test(i);
- if (fullname == test.fullname) {
+ if (fullName == test.fullName) {
result.push(test.id);
return result;
}
}
for (var i = 0; i < currentSuite.numberOfSuites; i++) {
var suite = currentSuite.suite(i);
- if (fullname.indexOf(suite.fullname + ".") == 0) {
+ if (fullName.indexOf(suite.fullName + ".") == 0) {
result.push(suite.id);
- return testPathTo(fullname, suite, result);
+ return testPathTo(fullName, suite, result);
}
}
}
- function suitePathTo(fullname, currentSuite, result) {
+ function suitePathTo(fullName, currentSuite, result) {
for (var i = 0; i < currentSuite.numberOfSuites; i++) {
var suite = currentSuite.suite(i);
- if (fullname == suite.fullname) {
+ if (fullName == suite.fullName) {
result.push(suite.id);
return result;
}
- if (fullname.indexOf(suite.fullname + ".") == 0) {
+ if (fullName.indexOf(suite.fullName + ".") == 0) {
result.push(suite.id);
- return suitePathTo(fullname, suite, result);
+ return suitePathTo(fullName, suite, result);
}
}
}
=======================================
--- /utest/webcontent/spec/ParsingSpec.js Tue Jun 21 00:48:43 2011
+++ /utest/webcontent/spec/ParsingSpec.js Tue Jun 21 00:56:46 2011
@@ -98,7 +98,7 @@
var test = window.testdata.suite().test(0);
expect(test.name).toEqual("Test");
expect(test.status).toEqual("PASS");
- expect(test.fullname).toEqual("Suite.Test");
+ expect(test.fullName).toEqual("Suite.Test");
expect(test.doc).toEqual("test doc");
expect(test.tags).toEqual(["tag1", "tag2"]);
expect(test.times).toBeDefined();
@@ -474,10 +474,10 @@
it("should show correct full names", function (){
var root = window.testdata.suite();
- expect(root.fullname).toEqual("Foo");
- expect(root.suite(0).fullname).toEqual("Foo.Bar");
- expect(root.suite(0).suite(0).fullname).toEqual("Foo.Bar.Testii");
-
expect(root.suite(1).suite(0).test(0).fullname).toEqual("Foo.Foo.Tostii.FOO
FOO");
+ expect(root.fullName).toEqual("Foo");
+ expect(root.suite(0).fullName).toEqual("Foo.Bar");
+ expect(root.suite(0).suite(0).fullName).toEqual("Foo.Bar.Testii");
+
expect(root.suite(1).suite(0).test(0).fullName).toEqual("Foo.Foo.Tostii.FOO
FOO");
});
it("should give navigation uuid list for a test", function (){
