You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2018/04/06 12:01:45 UTC
[myfaces-tobago] branch master updated: fix tests
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new ef8d967 fix tests
ef8d967 is described below
commit ef8d96703b1819cccdd8dcda1e22c618983c8354
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Apr 6 14:01:31 2018 +0200
fix tests
* fix test for selectOneChoice
* fix test for sheet sorting
* testAll.xhtml got more width for the test windows: some tests need a specific min-width
* remove style test for input group and sheet content
---
.../010-input/50-input-group/group.test.js | 108 ---------------------
.../20-selectOneChoice/selectOneChoice.test.js | 24 ++---
.../080-sheet/10-sort/sheet-sorting.test.js | 96 +++++++++---------
.../3000-sheet/10-sheet-types/sheet-types.test.js | 104 --------------------
.../src/main/webapp/testAll.xhtml | 2 +-
5 files changed, 61 insertions(+), 273 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js
deleted file mode 100644
index b5a7efb..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-QUnit.test("span(https://example.com/) - inputfield", function(assert) {
- var $mainForm = jQueryFrame("#page\\:mainForm");
- var $inputfield = jQueryFrame("#page\\:mainForm\\:itextbefore");
- var $span = $inputfield.find("span");
- var $input = $inputfield.find("input");
- var combinedWidth = $span.outerWidth(true) + $input.outerWidth(true);
-
- assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width() + 1,
- "Width of inputfield (" + $span.outerWidth(true) + "px) + span (" + $input.outerWidth(true) + "px) (="
- + combinedWidth + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
- assert.equal($span.outerHeight(), $input.outerHeight());
-});
-
-QUnit.test("label(Price) - inputfield - span(.00 €)", function(assert) {
- var $mainForm = jQueryFrame("#page\\:mainForm");
- var $inputfield = jQueryFrame("#page\\:mainForm\\:ipriceafter");
- var $label = $inputfield.find("label");
- var $input = $inputfield.find("input");
- var $span = $inputfield.find("span");
- var combinedWidth = $label.outerWidth(true) + $span.outerWidth(true) + $input.outerWidth(true);
-
- assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width() + 1,
- "Width of label (" + $label.outerWidth(true) + "px) + input (" + $input.outerWidth(true) + "px) + span ("
- + $span.outerWidth(true) + "px) (=" + combinedWidth
- + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
- assert.equal($span.outerHeight(), $input.outerHeight());
-});
-
-QUnit.test("span(User Two) - inputfield - button(Send)", function(assert) {
- var $mainForm = jQueryFrame("#page\\:mainForm");
- var $inputfield = jQueryFrame("#page\\:mainForm\\:inewmessage");
- var $span = $inputfield.find("span");
- var $input = $inputfield.find("input");
- var $button = $inputfield.find("button");
- var combinedWidth = $span.outerWidth(true) + $input.outerWidth(true) + $button.outerWidth(true);
-
- assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width() + 1,
- "Width of span (" + $span.outerWidth(true) + "px) + input (" + $input.outerWidth(true) + "px) + button ("
- + $button.outerWidth(true) + "px) (=" + combinedWidth
- + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
- assert.equal($span.outerHeight(), $input.outerHeight());
- assert.equal($span.outerHeight(), $button.outerHeight());
-});
-
-QUnit.test("dropdown-button - inputfield", function(assert) {
- var $mainForm = jQueryFrame("#page\\:mainForm");
- var $inputfield = jQueryFrame("#page\\:mainForm\\:isendtoc");
- var $button = $inputfield.find("button");
- var $input = $inputfield.find("input");
- var combinedWidth = $button.outerWidth(true) + $input.outerWidth(true);
-
- assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width() + 1,
- "Width of button (" + $button.outerWidth(true) + "px) + input (" + $input.outerWidth(true) + "px) (="
- + combinedWidth + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
- assert.equal($button.outerHeight(), $input.outerHeight());
-});
-
-QUnit.test("inputfield - span(Send To:) - dropdown-button", function(assert) {
- var $mainForm = jQueryFrame("#page\\:mainForm");
- var $inputfield = jQueryFrame("#page\\:mainForm\\:isendtorb");
- var $input = $inputfield.find("input");
- var $span = $inputfield.find(".input-group-addon");
- var $button = $inputfield.find("button");
- var combinedWidth = $input.outerWidth(true) + $span.outerWidth(true) + $button.outerWidth(true);
-
- assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width() + 1,
- "Width of input (" + $input.outerWidth(true) + "px) + span (" + $span.outerWidth(true) + "px) + button ("
- + $button.outerWidth(true) + "px) (=" + combinedWidth
- + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
- assert.equal($input.outerHeight(), $span.outerHeight());
- assert.equal($input.outerHeight(), $button.outerHeight());
-});
-
-QUnit.test("inputfield - dropdownbox", function(assert) {
- var $mainForm = jQueryFrame("#page\\:mainForm");
- var $inputfield = jQueryFrame("#page\\:mainForm\\:value");
- var $input = $inputfield.find("input");
- var $dropdown = $inputfield.find(".input-group-btn");
- var combinedWidth = $input.outerWidth(true) + $dropdown.outerWidth(true);
-
- assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width() + 1,
- "Width of input (" + $input.outerWidth(true) + "px) + dropdown (" + $dropdown.outerWidth(true) + "px) (="
- + combinedWidth + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
- assert.equal($input.outerHeight(), $dropdown.outerHeight());
-});
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js
index 904217a..3ade230 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js
@@ -73,12 +73,12 @@ QUnit.test("ajax: select Mars", function (assert) {
waitForAjax(function () {
$moons = jQueryFrame($moons.selector);
- return $moons.eq(0).text() === "Phobos"
- && $moons.eq(1).text() === "Deimos";
+ return $moons.eq(0).text().trim() === "Phobos"
+ && $moons.eq(1).text().trim() === "Deimos";
}, function () {
$moons = jQueryFrame($moons.selector);
- assert.equal($moons.eq(0).text(), "Phobos");
- assert.equal($moons.eq(1).text(), "Deimos");
+ assert.equal($moons.eq(0).text().trim(), "Phobos");
+ assert.equal($moons.eq(1).text().trim(), "Deimos");
done();
});
});
@@ -95,16 +95,16 @@ QUnit.test("ajax: select Jupiter", function (assert) {
waitForAjax(function () {
$moons = jQueryFrame($moons.selector);
- return $moons.eq(0).text() === "Europa"
- && $moons.eq(1).text() === "Ganymed"
- && $moons.eq(2).text() === "Io"
- && $moons.eq(3).text() === "Kallisto";
+ return $moons.eq(0).text().trim() === "Europa"
+ && $moons.eq(1).text().trim() === "Ganymed"
+ && $moons.eq(2).text().trim() === "Io"
+ && $moons.eq(3).text().trim() === "Kallisto";
}, function () {
$moons = jQueryFrame($moons.selector);
- assert.equal($moons.eq(0).text(), "Europa");
- assert.equal($moons.eq(1).text(), "Ganymed");
- assert.equal($moons.eq(2).text(), "Io");
- assert.equal($moons.eq(3).text(), "Kallisto");
+ assert.equal($moons.eq(0).text().trim(), "Europa");
+ assert.equal($moons.eq(1).text().trim(), "Ganymed");
+ assert.equal($moons.eq(2).text().trim(), "Io");
+ assert.equal($moons.eq(3).text().trim(), "Kallisto");
done();
});
});
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
index 8265e0a..aaafb5a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
@@ -225,46 +225,46 @@ QUnit.test("Basics: Year", function (assert) {
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
- return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() === "1789"
- && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() === "1848";
+ return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim() === "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim() === "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
- return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() === "1989"
- && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() === "1989"
- && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() === "1989"
- && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() === "1986";
+ return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim() === "1989"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim() === "1989"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim() === "1989"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim() === "1986";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1989", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1989", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1989", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1986", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
- return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() === "1789"
- && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() === "1848";
+ return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim() === "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim() === "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
step++;
done();
});
@@ -846,48 +846,48 @@ QUnit.test("Custom Sorting: Year", function (assert) {
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
return step === 2
- && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() === "1789"
- && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() === "1848";
+ && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim() === "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim() === "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
return step === 3
- && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() === "1989"
- && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() === "1989"
- && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() === "1989"
- && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() === "1986";
+ && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim() === "1989"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim() === "1989"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim() === "1989"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim() === "1986";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1989", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1989", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1989", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1986", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
return step === 4
- && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() === "1789"
- && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() === "1846"
- && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() === "1848";
+ && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim() === "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim() === "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim() === "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
step++;
done();
});
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js
deleted file mode 100644
index a77bb5c..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/sheet-types.test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-QUnit.test("Column 0: tc:columnSelector", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(0);
- testWidthHeight(assert, $column, 50, 63, 13, 13);
-});
-
-QUnit.test("Column 1: tc:out", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(1);
- testWidthHeight(assert, $column, 70, 63, 46, 40);
-});
-
-QUnit.test("Column 2: tc:out", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(2);
- testWidthHeight(assert, $column, 70, 63, 46, 40);
-});
-
-QUnit.test("Column 3: tc:in", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(3);
- testWidthHeight(assert, $column, 90, 63, 66, 38);
-});
-
-QUnit.test("Column 4: tc:date", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(4);
- testWidthHeight(assert, $column, 160, 63, 136, 38);
-});
-
-QUnit.test("Column 5: tc:button", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(5);
- testWidthHeight(assert, $column, 100, 63, 63, 38);
-});
-
-QUnit.test("Column 6: tc:link", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(6);
- testWidthHeight(assert, $column, 70, 63, 29, 20);
-});
-
-QUnit.test("Column 7: tc:selectOneChoice", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(7);
- testWidthHeight(assert, $column, 180, 63, 156, 40);
-});
-
-QUnit.test("Column 8: tc:image", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(8);
- testWidthHeight(assert, $column, 90, 63, 72, 30);
-});
-
-QUnit.test("Column 9: tc:flexLayout", function(assert) {
- assert.expect(4);
-
- var $column = getColumn(9);
- testWidthHeight(assert, $column, 130, 63, 112, 38);
-});
-
-function testWidthHeight(assert, $column, width, height, childWidth, childHeight) {
- assert.equal($column.get(0).offsetWidth, width);
- assert.equal($column.get(0).offsetHeight, height);
-
- //maximal difference 2px
- var offsetWidth = $column.children().get(0).offsetWidth;
- var offsetHeight = $column.children().get(0).offsetHeight;
- var delta = 2;
- assert.ok(Math.abs(offsetWidth - childWidth) <= delta,
- "expected: " + childWidth + " result: " + offsetWidth + " delta: " + delta);
- assert.ok(Math.abs(offsetHeight - childHeight) <= delta,
- "expected: " + childHeight + " result: " + offsetHeight + " delta: " + delta);
-}
-
-function getColumn(number) {
- return jQueryFrame("tr").eq(1).find("td").eq(number);
-}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
index 07c95ad..2b332da 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
@@ -31,7 +31,7 @@
<tc:link label="open in new tab" outcome="/#{testPage.base}.xhtml" target="_blank"/>
</div>
<tc:object id="#{testPage.id}" name="test.xhtml?base=#{testPage.base}">
- <tc:style height="300px"/>
+ <tc:style height="300px" width="500px"/>
</tc:object>
</div>
</c:forEach>
--
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.