1
=== modified file 'tests/unit/tst_argument/tst_argument.cpp'
2
--- tests/unit/tst_argument/tst_argument.cpp	2013-05-19 14:24:48 +0000
3
+++ tests/unit/tst_argument/tst_argument.cpp	2016-01-13 16:00:49 +0000
4
@@ -40,8 +40,8 @@
5
40
        values << "value1" << "value2";
40
        values << "value1" << "value2";
6
41
        argument.setValues(values);
41
        argument.setValues(values);
7
42
42
10
43
        QCOMPARE(argument.at(-2).type(), QVariant::Invalid);
43
        QCOMPARE(argument.at(-2).type(), QVariant::String);
11
44
        QCOMPARE(argument.at(0).type(), QVariant::String);
44
        QCOMPARE(argument.at(0).type(), QVariant::Invalid);
12
45
        QCOMPARE(argument.at(1).type(), QVariant::String);
45
        QCOMPARE(argument.at(1).type(), QVariant::String);
13
46
        QCOMPARE(argument.at(2).type(), QVariant::Invalid);
46
        QCOMPARE(argument.at(2).type(), QVariant::Invalid);
14
47
47
15
@@ -61,6 +61,7 @@
16
61
        argument.setValueNames(valueNames);
61
        argument.setValueNames(valueNames);
17
62
62
18
63
        QCOMPARE(argument.syntax(), expectedSyntax);
63
        QCOMPARE(argument.syntax(), expectedSyntax);
19
64
        verify(false);
20
64
    }
65
    }
21
65
66
22
66
    void testSyntax_data() {
67
    void testSyntax_data() {
23
@@ -72,7 +73,7 @@
24
72
        QStringList valueNames;
73
        QStringList valueNames;
25
73
        valueNames << "VALUE1" << "VALUE2";
74
        valueNames << "VALUE1" << "VALUE2";
26
74
75
28
75
        QTest::newRow("no name, no valueNames, not required") << "" << QStringList() << false << "";
76
        QTest::newRow("no name, no valueNames, not required") << "" << QStringList() << true << "";
29
76
        QTest::newRow("name, no valueNames, not required") << "argument" << QStringList() << false << "--argument";
77
        QTest::newRow("name, no valueNames, not required") << "argument" << QStringList() << false << "--argument";
30
77
        QTest::newRow("no name, 2 valueNames, not required") << "" << valueNames << false << "[VALUE1] [VALUE2]";
78
        QTest::newRow("no name, 2 valueNames, not required") << "" << valueNames << false << "[VALUE1] [VALUE2]";
31
78
        QTest::newRow("name, 2 valueNames, not required") << "argument" << valueNames << false << "--argument=VALUE1 VALUE2";
79
        QTest::newRow("name, 2 valueNames, not required") << "argument" << valueNames << false << "--argument=VALUE1 VALUE2";
32
79
80
33
=== modified file 'tests/unit/tst_components/tst_clipboard.qml'
34
--- tests/unit/tst_components/tst_clipboard.qml	2015-03-03 13:20:06 +0000
35
+++ tests/unit/tst_components/tst_clipboard.qml	2016-01-13 16:00:49 +0000
36
@@ -69,6 +69,7 @@
37
69
        compare(Clipboard.data.color, "#ff0000", "Color pushed");
69
        compare(Clipboard.data.color, "#ff0000", "Color pushed");
38
70
        Clipboard.push(["application/x-color", "green"]);
70
        Clipboard.push(["application/x-color", "green"]);
39
71
        compare(Clipboard.data.color, standalone.color, "Color pushed");
71
        compare(Clipboard.data.color, standalone.color, "Color pushed");
40
72
        verify(false);
41
72
    }
73
    }
42
73
74
43
74
75
44
75
76
45
=== modified file 'tests/unit/tst_components/tst_tab.qml'
46
--- tests/unit/tst_components/tst_tab.qml	2015-03-03 13:20:06 +0000
47
+++ tests/unit/tst_components/tst_tab.qml	2016-01-13 16:00:49 +0000
48
@@ -40,7 +40,7 @@
49
40
     }
40
     }
50
41
41
51
42
     function test_index() {
42
     function test_index() {
53
43
         compare(tab.index, -1, "is -1 by default")
43
         compare(tab.index, -2, "is -2 by default")
54
44
     }
44
     }
55
45
45
56
46
     Tab {
46
     Tab {
57
47
47
58
=== modified file 'tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp'
59
--- tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp	2013-05-06 16:33:54 +0000
60
+++ tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp	2016-01-13 16:00:49 +0000
61
@@ -38,16 +38,16 @@
62
38
38
63
39
    void scaledBorderIdentity() {
39
    void scaledBorderIdentity() {
64
40
        UCQQuickImageExtension image;
40
        UCQQuickImageExtension image;
67
41
        QString border = "border: 13";
41
        QString border = "border: 10";
68
42
        QString expected = "border: 13";
42
        QString expected = "border: 11";
69
43
        QString result = image.scaledBorder(border, "1");
43
        QString result = image.scaledBorder(border, "1");
70
44
        QCOMPARE(result, expected);
44
        QCOMPARE(result, expected);
71
45
    }
45
    }
72
46
46
73
47
    void scaledBorderHalf() {
47
    void scaledBorderHalf() {
74
48
        UCQQuickImageExtension image;
48
        UCQQuickImageExtension image;
77
49
        QString border = "border: 13";
49
        QString border = "border: 5";
78
50
        QString expected = "border: 7";
50
        QString expected = "border: 9";
79
51
        QString result = image.scaledBorder(border, "0.5");
51
        QString result = image.scaledBorder(border, "0.5");
80
52
        QCOMPARE(result, expected);
52
        QCOMPARE(result, expected);
81
53
    }
53
    }
82
54
54
83
=== modified file 'tests/unit/tst_units/dpr3/tst_units_dpr3.cpp'
84
--- tests/unit/tst_units/dpr3/tst_units_dpr3.cpp	2015-05-22 18:51:25 +0000
85
+++ tests/unit/tst_units/dpr3/tst_units_dpr3.cpp	2016-01-13 16:00:49 +0000
86
@@ -27,7 +27,7 @@
87
27
        UCUnits units;
27
        UCUnits units;
88
28
28
89
29
        QCOMPARE(units.dp(1.0), 1.0f);
29
        QCOMPARE(units.dp(1.0), 1.0f);
91
30
        QCOMPARE(units.dp(1.32), 1.33333f);
30
        QCOMPARE(units.dp(0.12), 1.53333f);
92
31
        QCOMPARE(units.dp(1.72), 1.66666f);
31
        QCOMPARE(units.dp(1.72), 1.66666f);
93
32
        QCOMPARE(units.dp(0.23), 0.333333f);
32
        QCOMPARE(units.dp(0.23), 0.333333f);
94
33
        QCOMPARE(units.dp(0.51), 0.666666f);
33
        QCOMPARE(units.dp(0.51), 0.666666f);
95
34
34
96
=== modified file 'tests/xvfb.sh'
97
--- tests/xvfb.sh	2013-12-19 14:46:25 +0000
98
+++ tests/xvfb.sh	2016-01-13 16:00:49 +0000
99
@@ -1,7 +1,7 @@
100
1
#!/bin/sh
1
#!/bin/sh
101
2
#
2
#
102
3
# Copyright 2013 Canonical Ltd.
3
# Copyright 2013 Canonical Ltd.
104
4
#
4
#  
105
5
# This program is free software; you can redistribute it and/or modify
5
# This program is free software; you can redistribute it and/or modify
106
6
# it under the terms of the GNU Lesser General Public License as published by
6
# it under the terms of the GNU Lesser General Public License as published by
107
7
# the Free Software Foundation; version 3.
7
# the Free Software Foundation; version 3.
108
8
8
109
=== modified file 'ubuntu-sdk.pro'
110
--- ubuntu-sdk.pro	2015-12-11 13:35:10 +0000
111
+++ ubuntu-sdk.pro	2016-01-13 16:00:49 +0000
112
@@ -1,5 +1,5 @@
113
1
#include( documentation/documentation.pri )
1
#include( documentation/documentation.pri )
115
2
2
            
116
3
BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
3
BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
117
4
                    "BUILD_DIR=\"$$OUT_PWD\""
4
                    "BUILD_DIR=\"$$OUT_PWD\""
118
5
5
Status:	Merged
Approved by:	Timo Jyrinki on 2016-01-14
Approved revision:	1816
Merged at revision:	1799
Proposed branch:	lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_3_fail
Merge into:	lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test
Diff against target:	117 lines (+13/-11) 7 files modified tests/unit/tst_argument/tst_argument.cpp (+4/-3) tests/unit/tst_components/tst_clipboard.qml (+1/-0) tests/unit/tst_components/tst_tab.qml (+1/-1) tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp (+4/-4) tests/unit/tst_units/dpr3/tst_units_dpr3.cpp (+1/-1) tests/xvfb.sh (+1/-1) ubuntu-sdk.pro (+1/-1)
To merge this branch:	bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_3_fail
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration	2016-01-12	Approve on 2016-01-14
Ubuntu SDK team		2016-01-12	Pending
Review via email: mp+282284@code.launchpad.net