Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kcalc/files: kcalc-4.8.1-dot.patch
Date: Sun, 01 Apr 2012 16:39:12
Message-Id: 20120401163903.DD7CA2004C@flycatcher.gentoo.org
1 dilfridge 12/04/01 16:39:03
2
3 Added: kcalc-4.8.1-dot.patch
4 Log:
5 Fix some tests, unfortunately not all
6
7 (Portage version: 2.1.10.52/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 kde-base/kcalc/files/kcalc-4.8.1-dot.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kcalc/files/kcalc-4.8.1-dot.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kcalc/files/kcalc-4.8.1-dot.patch?rev=1.1&content-type=text/plain
14
15 Index: kcalc-4.8.1-dot.patch
16 ===================================================================
17 From dd35eaac4aa993688db25d368bd88d524c3ce80f Mon Sep 17 00:00:00 2001
18 From: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o>
19 Date: Thu, 22 Mar 2012 09:37:31 +0100
20 Subject: [PATCH] It seems like 2/3 got replaced errorneously by 2.3 in some
21 places, making the tests fail needlessly.
22
23 ---
24 knumber/tests/knumbertest.cpp | 28 ++++++++++++++--------------
25 1 file changed, 14 insertions(+), 14 deletions(-)
26
27 diff --git a/knumber/tests/knumbertest.cpp b/knumber/tests/knumbertest.cpp
28 index a072cc9..c555c73 100644
29 --- a/knumber/tests/knumbertest.cpp
30 +++ b/knumber/tests/knumbertest.cpp
31 @@ -129,11 +129,11 @@ void testingAdditions()
32 std::cout << "\n\nTesting additions:\n";
33
34 checkResult("KNumber(5) + KNumber(2)", KNumber(5) + KNumber(2), "7", KNumber::IntegerType);
35 - checkResult("KNumber(5) + KNumber(\"2/3\")", KNumber(5) + KNumber(QLatin1String("2.3")), "17/3", KNumber::FractionType);
36 + checkResult("KNumber(5) + KNumber(\"2/3\")", KNumber(5) + KNumber(QLatin1String("2/3")), "17/3", KNumber::FractionType);
37 checkResult("KNumber(5) + KNumber(\"2.3\")", KNumber(5) + KNumber(QLatin1String("2.3")), "7.3", KNumber::FloatType);
38
39 checkResult("KNumber(\"5/3\") + KNumber(2)", KNumber(QLatin1String("5/3")) + KNumber(2), "11/3", KNumber::FractionType);
40 - checkResult("KNumber(\"5/3\") + KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) + KNumber(QLatin1String("2.3")), "7/3", KNumber::FractionType);
41 + checkResult("KNumber(\"5/3\") + KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) + KNumber(QLatin1String("2/3")), "7/3", KNumber::FractionType);
42 checkResult("KNumber(\"5/3\") + KNumber(\"1/3\")", KNumber(QLatin1String("5/3")) + KNumber("1/3"), QLatin1String("2"), KNumber::IntegerType);
43 checkResult("KNumber(\"5/3\") + KNumber(\"-26/3\")", KNumber(QLatin1String("5/3")) + KNumber("-26/3"), "-7", KNumber::IntegerType);
44 checkResult("KNumber(\"5/2\") + KNumber(2.3)", KNumber(QLatin1String("5/2")) + KNumber(2.3), "4.8", KNumber::FloatType);
45 @@ -149,12 +149,12 @@ void testingSubtractions()
46 std::cout << "\n\nTesting subtractions:\n";
47
48 checkResult("KNumber(5) - KNumber(2)", KNumber(5) - KNumber(2), QLatin1String("3"), KNumber::IntegerType);
49 - checkResult("KNumber(5) - KNumber(\"2/3\")", KNumber(5) - KNumber(QLatin1String("2.3")), "13/3", KNumber::FractionType);
50 + checkResult("KNumber(5) - KNumber(\"2/3\")", KNumber(5) - KNumber(QLatin1String("2/3")), "13/3", KNumber::FractionType);
51 checkResult("KNumber(5) - KNumber(2.3)", KNumber(5) - KNumber(2.3), "2.7", KNumber::FloatType);
52
53 checkResult("KNumber(\"5/3\") - KNumber(2)", KNumber(QLatin1String("5/3")) - KNumber(2), "-1/3", KNumber::FractionType);
54 checkResult("KNumber(\"5/3\") - KNumber(\"1/3\")", KNumber(QLatin1String("5/3")) - KNumber("1/3"), "4/3", KNumber::FractionType);
55 - checkResult("KNumber(\"5/3\") - KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) - KNumber(QLatin1String("2.3")), QLatin1String("1"), KNumber::IntegerType);
56 + checkResult("KNumber(\"5/3\") - KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) - KNumber(QLatin1String("2/3")), QLatin1String("1"), KNumber::IntegerType);
57 checkResult("KNumber(\"-5/3\") - KNumber(\"4/3\")", KNumber(QLatin1String("-5/3")) - KNumber("4/3"), "-3", KNumber::IntegerType);
58 checkResult("KNumber(\"5/4\") - KNumber(2.2)", KNumber("5/4") - KNumber(2.2), "-0.95", KNumber::FloatType);
59
60 @@ -170,7 +170,7 @@ void testingMultiplications()
61 std::cout << "\n\nTesting multiplications:\n";
62
63 checkResult("KNumber(5) * KNumber(2)", KNumber(5) * KNumber(2), "10", KNumber::IntegerType);
64 - checkResult("KNumber(5) * KNumber(\"2/3\")", KNumber(5) * KNumber(QLatin1String("2.3")), "10/3", KNumber::FractionType);
65 + checkResult("KNumber(5) * KNumber(\"2/3\")", KNumber(5) * KNumber(QLatin1String("2/3")), "10/3", KNumber::FractionType);
66 checkResult("KNumber(5) * KNumber(\"2/5\")", KNumber(5) * KNumber("2/5"), QLatin1String("2"), KNumber::IntegerType);
67 checkResult("KNumber(5) * KNumber(2.3)", KNumber(5) * KNumber(2.3), "11.5", KNumber::FloatType);
68 checkResult("KNumber(0) * KNumber(\"2/5\")", KNumber(0) * KNumber("2/5"), QLatin1String("0"), KNumber::IntegerType);
69 @@ -178,7 +178,7 @@ void testingMultiplications()
70
71 checkResult("KNumber(\"5/3\") * KNumber(2)", KNumber(QLatin1String("5/3")) * KNumber(2), "10/3", KNumber::FractionType);
72 checkResult("KNumber(\"5/3\") * KNumber(0)", KNumber(QLatin1String("5/3")) * KNumber(0), QLatin1String("0"), KNumber::IntegerType);
73 - checkResult("KNumber(\"5/3\") * KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) * KNumber(QLatin1String("2.3")), "10/9", KNumber::FractionType);
74 + checkResult("KNumber(\"5/3\") * KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) * KNumber(QLatin1String("2/3")), "10/9", KNumber::FractionType);
75 checkResult("KNumber(\"25/6\") * KNumber(\"12/5\")", KNumber("25/6") * KNumber("12/5"), "10", KNumber::IntegerType);
76 checkResult("KNumber(\"5/2\") * KNumber(2.3)", KNumber(QLatin1String("5/2")) * KNumber(2.3), "5.75", KNumber::FloatType);
77
78 @@ -197,8 +197,8 @@ void testingDivisions()
79 checkResult("KNumber(122) / KNumber(2)", KNumber(122) / KNumber(2), "61", KNumber::IntegerType);
80 checkResult("KNumber(12) / KNumber(0)", KNumber(12) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
81 checkResult("KNumber(-12) / KNumber(0)", KNumber(-12) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
82 - checkResult("KNumber(5) / KNumber(\"2/3\")", KNumber(5) / KNumber(QLatin1String("2.3")), "15/2", KNumber::FractionType);
83 - checkResult("KNumber(6) / KNumber(\"2/3\")", KNumber(6) / KNumber(QLatin1String("2.3")), "9", KNumber::IntegerType);
84 + checkResult("KNumber(5) / KNumber(\"2/3\")", KNumber(5) / KNumber(QLatin1String("2/3")), "15/2", KNumber::FractionType);
85 + checkResult("KNumber(6) / KNumber(\"2/3\")", KNumber(6) / KNumber(QLatin1String("2/3")), "9", KNumber::IntegerType);
86 checkResult("KNumber(5) / KNumber(2.5)", KNumber(5) / KNumber(2.5), QLatin1String("2"), KNumber::FloatType);
87 checkResult("KNumber(5) / KNumber(0.0)", KNumber(5) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
88 checkResult("KNumber(-5) / KNumber(0.0)", KNumber(-5) / KNumber(0.0), QLatin1String("-inf"), KNumber::SpecialType);
89 @@ -206,7 +206,7 @@ void testingDivisions()
90 checkResult("KNumber(\"5/3\") / KNumber(2)", KNumber(QLatin1String("5/3")) / KNumber(2), "5/6", KNumber::FractionType);
91 checkResult("KNumber(\"5/3\") / KNumber(0)", KNumber(QLatin1String("5/3")) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
92 checkResult("KNumber(\"-5/3\") / KNumber(0)", KNumber(QLatin1String("-5/3")) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
93 - checkResult("KNumber(\"5/3\") / KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) / KNumber(QLatin1String("2.3")), QLatin1String("5/2"), KNumber::FractionType);
94 + checkResult("KNumber(\"5/3\") / KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) / KNumber(QLatin1String("2/3")), QLatin1String("5/2"), KNumber::FractionType);
95 checkResult("KNumber(\"49/3\") / KNumber(\"7/9\")", KNumber("49/3") / KNumber("7/9"), "21", KNumber::IntegerType);
96 checkResult("KNumber(\"5/2\") / KNumber(2.5)", KNumber(QLatin1String("5/2")) / KNumber(2.5), QLatin1String("1"), KNumber::FloatType);
97 checkResult("KNumber(\"5/2\") / KNumber(0.0)", KNumber(QLatin1String("5/2")) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
98 @@ -215,7 +215,7 @@ void testingDivisions()
99 checkResult("KNumber(5.3) / KNumber(2)", KNumber(5.3) / KNumber(2), "2.65", KNumber::FloatType);
100 checkResult("KNumber(5.3) / KNumber(0)", KNumber(5.3) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
101 checkResult("KNumber(-5.3) / KNumber(0)", KNumber(-5.3) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
102 - checkResult("KNumber(5.3) / KNumber(\"2/3\")", KNumber(5.3) / KNumber(QLatin1String("2.3")), "7.95", KNumber::FloatType);
103 + checkResult("KNumber(5.3) / KNumber(\"2/3\")", KNumber(5.3) / KNumber(QLatin1String("2/3")), "7.95", KNumber::FloatType);
104 checkResult("KNumber(5.5) / KNumber(2.5)", KNumber(5.5) / KNumber(2.5), "2.2", KNumber::FloatType);
105 checkResult("KNumber(5.5) / KNumber(0.0)", KNumber(5.5) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
106 checkResult("KNumber(-5.5) / KNumber(0.0)", KNumber(-5.5) / KNumber(0.0), QLatin1String("-inf"), KNumber::SpecialType);
107 @@ -258,11 +258,11 @@ void testingAbs()
108 std::cout << "\n\nTesting absolute value:\n";
109
110 checkResult("KNumber(5).abs()", KNumber(5).abs(), QLatin1String("5"), KNumber::IntegerType);
111 - checkResult("KNumber(\"2/3\").abs()", KNumber(QLatin1String("2.3")).abs(), QLatin1String("2.3"), KNumber::FractionType);
112 + checkResult("KNumber(\"2/3\").abs()", KNumber(QLatin1String("2/3")).abs(), QLatin1String("2/3"), KNumber::FractionType);
113 checkResult("KNumber(\"2.3\").abs()", KNumber(QLatin1String("2.3")).abs(), QLatin1String("2.3"), KNumber::FloatType);
114
115 checkResult("KNumber(-5).abs()", KNumber(-5).abs(), QLatin1String("5"), KNumber::IntegerType);
116 - checkResult("KNumber(\"-2/3\").abs()", KNumber(QLatin1String("-2/3")).abs(), QLatin1String("2.3"), KNumber::FractionType);
117 + checkResult("KNumber(\"-2/3\").abs()", KNumber(QLatin1String("-2/3")).abs(), QLatin1String("2/3"), KNumber::FractionType);
118 checkResult("KNumber(\"-2.3\").abs()", KNumber("-2.3").abs(), QLatin1String("2.3"), KNumber::FloatType);
119 }
120
121 @@ -287,7 +287,7 @@ void testingSqrt()
122 checkResult("KNumber(\"16/9\").sqrt()", KNumber("16/9").sqrt(), "4/3", KNumber::FractionType);
123 checkResult("KNumber(\"-16/9\").sqrt()", KNumber("-16/9").sqrt(), QLatin1String("nan"), KNumber::SpecialType);
124 checkResult("KNumber(2).sqrt()", KNumber(2).sqrt(), "1.41421356237", KNumber::FloatType);
125 - checkResult("KNumber(\"2/3\").sqrt()", KNumber(QLatin1String("2.3")).sqrt(), "0.816496580928", KNumber::FloatType);
126 + checkResult("KNumber(\"2/3\").sqrt()", KNumber(QLatin1String("2/3")).sqrt(), "0.816496580928", KNumber::FloatType);
127 checkResult("KNumber(\"0.25\").sqrt()", KNumber("0.25").sqrt(), "0.5", KNumber::FloatType);
128 checkResult("KNumber(\"-0.25\").sqrt()", KNumber("-0.25").sqrt(), QLatin1String("nan"), KNumber::SpecialType);
129
130 @@ -378,7 +378,7 @@ void testingPower()
131 checkResult("KNumber(-2) ^ KNumber(3)", KNumber(-2).power(KNumber(3)), "-8", KNumber::IntegerType);
132 checkResult("KNumber(-2) ^ KNumber(4)", KNumber(-2).power(KNumber(4)), QLatin1String("16"), KNumber::IntegerType);
133 checkResult("KNumber(5) ^ KNumber(-2)", KNumber(5).power(KNumber(-2)), "1/25", KNumber::FractionType);
134 - checkResult("KNumber(8) ^ KNumber(\"2/3\")", KNumber(8).power(KNumber(QLatin1String("2.3"))), "4", KNumber::IntegerType);
135 + checkResult("KNumber(8) ^ KNumber(\"2/3\")", KNumber(8).power(KNumber(QLatin1String("2/3"))), "4", KNumber::IntegerType);
136 checkResult("KNumber(8) ^ KNumber(\"-2/3\")", KNumber(8).power(KNumber(QLatin1String("-2/3"))), "1/4", KNumber::FractionType);
137 checkResult("KNumber(-16) ^ KNumber(\"1/4\")", KNumber(-16).power(KNumber("1/4")), QLatin1String("nan"), KNumber::SpecialType);
138 checkResult("KNumber(-8) ^ KNumber(\"1/3\")", KNumber(-8).power(KNumber("1/3")), QLatin1String("nan"), KNumber::SpecialType);
139 --
140 1.7.9.2
Report Message
Find on MARC Find on Google Groups