diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-11-16 05:44:32 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-11-16 06:03:13 (GMT) |
commit | df1a50f6bd25c0955c7d8e4b6b89a7b7957b69f6 (patch) | |
tree | d8a72e5fafc4ec2b2331ee9288a94ebc6dedfdae /tests/auto/declarative/qmlvisual/qdeclarativetext/font | |
parent | 60436458bbde50b03e10f13d61625b0aef8fbf3d (diff) | |
download | Qt-df1a50f6bd25c0955c7d8e4b6b89a7b7957b69f6.zip Qt-df1a50f6bd25c0955c7d8e4b6b89a7b7957b69f6.tar.gz Qt-df1a50f6bd25c0955c7d8e4b6b89a7b7957b69f6.tar.bz2 |
Update qml visual tests
Added guidelines for size, and shrunk tests that exceeded them.
Also updated the visuals for all text tests now that antialiasing is off
Also some other minor cleanups.
Also had to update the visuals for all tests, due to the bug in
generating the test scripts being fixed (all need to be remade).
Task-number: QTBUG-14792
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetext/font')
13 files changed, 107 insertions, 75 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/BorderedText.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/BorderedText.qml index 6514694..fe4e2e7 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/BorderedText.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/BorderedText.qml @@ -3,6 +3,7 @@ import "../../shared" 1.0 TestText { property color bcolor: "blue" + font.pixelSize: 10 text: "The quick brown fox\njumps over\nthe lazy dog." Rectangle { id: border; color: "transparent"; border.color: bcolor; anchors.fill: parent; opacity: 0.2 } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png Binary files differindex 30dc0a9..688de40 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png Binary files differindex 0574f63..4177b9e 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext3.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext3.0.png Binary files differindex d7de152..04e0f5e 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext3.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext3.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png Binary files differindex 8d3c37b..36e5d35 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png Binary files differnew file mode 100644 index 0000000..34f8e38 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.qml new file mode 100644 index 0000000..afae3f8 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.qml @@ -0,0 +1,11 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + image: "richtext2.0.png" + } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext2.0.png Binary files differnew file mode 100644 index 0000000..34f8e38 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext2.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext2.qml new file mode 100644 index 0000000..afae3f8 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/richtext2.qml @@ -0,0 +1,11 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + image: "richtext2.0.png" + } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml index 3a06cf0..c1325f0 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml @@ -2,40 +2,55 @@ import QtQuick 1.0 import "../../shared" 1.0 Rectangle { - id: s; width: 620; height: 600; color: "lightsteelblue" + id: s; width: 620; height: 360; color: "lightsteelblue" property string text: "Jackdaws love my big sphinx of quartz." Column { spacing: 8 TestText { - text: s.text - } - TestText { - text: s.text; font.pixelSize: 18 - } - TestText { - text: s.text; font.pointSize: 20 - } - TestText { - text: s.text; color: "red"; smooth: true - } - TestText { - text: s.text; font.capitalization: "AllUppercase" - } - TestText { - text: s.text; font.underline: true - } - TestText { - text: s.text; font.overline: true; smooth: true + text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width } TestText { - text: s.text; font.strikeout: true + font.pixelSize: 18 + text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; } TestText { - text: s.text; font.underline: true; font.overline: true; font.strikeout: true + font.pointSize: 20 + text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; } - TestText { - text: s.text; font.letterSpacing: 2 + Grid{ + columns: 2 + spacing: 4 + TestText { + text: s.text; color: "red"; smooth: true + } + TestText { + text: s.text; font.capitalization: "AllUppercase" + } + TestText { + text: s.text; font.underline: true + } + TestText { + text: s.text; font.overline: true; smooth: true + } + TestText { + text: s.text; font.strikeout: true + } + TestText { + text: s.text; font.underline: true; font.overline: true; font.strikeout: true + } + TestText { + text: s.text; style: Text.Outline; styleColor: "white" + } + TestText { + text: s.text; style: Text.Sunken; styleColor: "gray" + } + TestText { + text: s.text; style: Text.Raised; styleColor: "yellow" + } + TestText { + text: s.text; font.letterSpacing: 2 + } } TestText { text: s.text; font.underline: true; font.letterSpacing: 2; font.capitalization: "AllUppercase"; color: "blue" @@ -43,24 +58,6 @@ Rectangle { TestText { text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green" } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white" - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray" - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow" - } - TestText { - text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width - } - TestText { - text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20 - } - TestText { - text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20 - } Row{ height: childrenRect.height spacing: 4 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml index 715ada6..10a2d9a 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 Rectangle { id: main - width: 800; height: 400 + width: 620; height: 280 Grid { diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml index 3670479..d0960c3 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 import "../../shared" 1.0 Rectangle { - id: s; width: 620; height: 600; color: "lightsteelblue" + id: s; width: 620; height: 300; color: "lightsteelblue" property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>." Column { @@ -43,36 +43,5 @@ Rectangle { TestText { text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green" } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white" - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray" - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow" - } - TestText { - text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width - } - TestText { - text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20 - } - TestText { - text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20 - } - Row{ - height: childrenRect.height; - spacing: 4 - TestText { - text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere - } - TestText { - text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap - } - TestText { - text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200 - } - } } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext2.qml new file mode 100644 index 0000000..f5e85fa --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/richtext2.qml @@ -0,0 +1,43 @@ +import QtQuick 1.0 +import "../../shared" 1.0 + +//This is a continuation of richtext.qml, it was bisected so that it could fit on smaller screens +Rectangle { + id: s; width: 620; height: 300; color: "lightsteelblue" + property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>." + + Column { + spacing: 6 + TestText { + text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white" + } + TestText { + text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray" + } + TestText { + text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow" + } + TestText { + text: s.text; horizontalAlignment: Text.AlignLeft; width: s.width + } + TestText { + text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: s.width; height: 20 + } + TestText { + text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: s.width; height: 20 + } + Row{ + height: childrenRect.height; + spacing: 4 + TestText { + text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.WrapAnywhere + } + TestText { + text: s.text + " thisisaverylongstringwithnospaces"; width: 150; wrapMode: Text.Wrap + } + TestText { + text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrapMode: Text.WordWrap; width: 200 + } + } + } +} |