Skip to content

Commit 9e27167

Browse files
ddobrevddobrev
committed
Fixed 40 tests according to the behaviour of Qt.
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent 6e6a70d commit 9e27167

File tree

2 files changed

+89
-89
lines changed

2 files changed

+89
-89
lines changed

‎QtSharp.Tests/Manual/QtCore/Tools/QRectFTests.cs

+39-39
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public void TestAdjust()
8181

8282
Assert.AreEqual(100, s.X);
8383
Assert.AreEqual(250, s.Y);
84-
Assert.AreEqual(650, s.Width);
85-
Assert.AreEqual(800, s.Height);
84+
Assert.AreEqual(600, s.Width);
85+
Assert.AreEqual(700, s.Height);
8686
}
8787

8888
[Test]
@@ -98,8 +98,8 @@ public void TestAdjusted()
9898

9999
Assert.AreEqual(100, n.X);
100100
Assert.AreEqual(250, n.Y);
101-
Assert.AreEqual(650, n.Width);
102-
Assert.AreEqual(800, n.Height);
101+
Assert.AreEqual(600, n.Width);
102+
Assert.AreEqual(700, n.Height);
103103
}
104104

105105
[Test]
@@ -127,7 +127,7 @@ public void TestBottomLeft()
127127

128128
var n = s.BottomLeft;
129129

130-
Assert.AreEqual(new QPointF(s.Left, s.Height + s.Top - 1), n);
130+
Assert.AreEqual(new QPointF(s.Left, s.Height + s.Top), n);
131131
}
132132

133133
[Test]
@@ -141,7 +141,7 @@ public void TestBottomRight()
141141

142142
var n = s.BottomRight;
143143

144-
Assert.AreEqual(new QPointF(s.Left + s.Width - 1, s.Top + s.Height - 1), n);
144+
Assert.AreEqual(new QPointF(s.Left + s.Width, s.Top + s.Height), n);
145145
}
146146

147147
[Test]
@@ -155,8 +155,8 @@ public void TestCenter()
155155

156156
var n = s.Center;
157157

158-
Assert.AreEqual(275, n.X);
159-
Assert.AreEqual(375, n.Y);
158+
Assert.AreEqual(300, n.X);
159+
Assert.AreEqual(450, n.Y);
160160
}
161161

162162
[Test]
@@ -403,8 +403,8 @@ public void TestMarginsAdded()
403403

404404
var newR = s.MarginsAdded(mar);
405405

406-
Assert.AreEqual(100, newR.Left);
407-
Assert.AreEqual(250, newR.Top);
406+
Assert.AreEqual(0, newR.Left);
407+
Assert.AreEqual(50, newR.Top);
408408
Assert.AreEqual(750, newR.Right);
409409
Assert.AreEqual(700, newR.Bottom);
410410
}
@@ -422,8 +422,8 @@ public void TestMarginsRemoved()
422422

423423
var newR = s.MarginsRemoved(mar);
424424

425-
Assert.AreEqual(0, newR.Left);
426-
Assert.AreEqual(50, newR.Top);
425+
Assert.AreEqual(100, newR.Left);
426+
Assert.AreEqual(250, newR.Top);
427427
Assert.AreEqual(450, newR.Right);
428428
Assert.AreEqual(300, newR.Bottom);
429429
}
@@ -439,7 +439,7 @@ public void TestMoveBottom()
439439

440440
s.MoveBottom(50);
441441

442-
Assert.AreEqual(550, s.Bottom);
442+
Assert.AreEqual(50, s.Bottom);
443443
}
444444

445445
[Test]
@@ -473,7 +473,7 @@ public void TestMoveBottomRight()
473473
Assert.AreEqual(500, s.Width);
474474
Assert.AreEqual(600, s.Height);
475475
Assert.AreEqual(100, s.X);
476-
Assert.AreEqual(100, s.Y);
476+
Assert.AreEqual(0, s.Y);
477477
}
478478

479479
[Test]
@@ -506,7 +506,7 @@ public void TestMoveLeft()
506506

507507
Assert.AreEqual(500, s.Width);
508508
Assert.AreEqual(600, s.Height);
509-
Assert.AreEqual(0, s.X);
509+
Assert.AreEqual(50, s.X);
510510
Assert.AreEqual(100, s.Y);
511511
}
512512

@@ -523,7 +523,7 @@ public void TestMoveRight()
523523

524524
Assert.AreEqual(500, s.Width);
525525
Assert.AreEqual(600, s.Height);
526-
Assert.AreEqual(100, s.X);
526+
Assert.AreEqual(-450, s.X);
527527
Assert.AreEqual(100, s.Y);
528528
}
529529

@@ -625,8 +625,8 @@ public void TestNormalized()
625625

626626
Assert.IsTrue(n.Width > 0);
627627
Assert.IsTrue(n.Height > 0);
628-
Assert.AreEqual(0, n.X);
629-
Assert.AreEqual(0, n.Y);
628+
Assert.AreEqual(-1, n.X);
629+
Assert.AreEqual(-1, n.Y);
630630
}
631631

632632
[Test]
@@ -882,10 +882,10 @@ public void TestAddMarginOperator()
882882

883883
s1 += s2;
884884

885-
Assert.AreEqual(100, s1.X);
886-
Assert.AreEqual(100, s1.Y);
887-
Assert.AreEqual(500, s1.Width);
888-
Assert.AreEqual(600, s1.Height);
885+
Assert.AreEqual(-100, s1.X);
886+
Assert.AreEqual(-100, s1.Y);
887+
Assert.AreEqual(700, s1.Width);
888+
Assert.AreEqual(800, s1.Height);
889889
}
890890

891891
[Test]
@@ -899,12 +899,12 @@ public void TestSubMarginOperator()
899899

900900
var s2 = new QMarginsF(100, 100, 100, 100);
901901

902-
s1 += s2;
902+
s1 -= s2;
903903

904-
Assert.AreEqual(0, s1.X);
905-
Assert.AreEqual(0, s1.Y);
906-
Assert.AreEqual(500, s1.Width);
907-
Assert.AreEqual(600, s1.Height);
904+
Assert.AreEqual(200, s1.X);
905+
Assert.AreEqual(200, s1.Y);
906+
Assert.AreEqual(300, s1.Width);
907+
Assert.AreEqual(400, s1.Height);
908908
}
909909

910910
[Test]
@@ -984,10 +984,10 @@ public void TestAddMarginToNewRectOperator()
984984

985985
var n = s1 + s2;
986986

987-
Assert.AreEqual(100, n.X);
988-
Assert.AreEqual(100, n.Y);
989-
Assert.AreEqual(500, n.Width);
990-
Assert.AreEqual(600, n.Height);
987+
Assert.AreEqual(-100, n.X);
988+
Assert.AreEqual(-100, n.Y);
989+
Assert.AreEqual(700, n.Width);
990+
Assert.AreEqual(800, n.Height);
991991
}
992992

993993
[Test]
@@ -1003,10 +1003,10 @@ public void TestAddMarginToNewRectOperator2()
10031003

10041004
var n = s2 + s1;
10051005

1006-
Assert.AreEqual(100, n.X);
1007-
Assert.AreEqual(100, n.Y);
1008-
Assert.AreEqual(500, n.Width);
1009-
Assert.AreEqual(600, n.Height);
1006+
Assert.AreEqual(-100, n.X);
1007+
Assert.AreEqual(-100, n.Y);
1008+
Assert.AreEqual(700, n.Width);
1009+
Assert.AreEqual(800, n.Height);
10101010
}
10111011

10121012
[Test]
@@ -1022,10 +1022,10 @@ public void TestSubMarginToNewRectOperator()
10221022

10231023
var n = s1 - s2;
10241024

1025-
Assert.AreEqual(0, n.X);
1026-
Assert.AreEqual(0, n.Y);
1027-
Assert.AreEqual(500, n.Width);
1028-
Assert.AreEqual(600, n.Height);
1025+
Assert.AreEqual(200, n.X);
1026+
Assert.AreEqual(200, n.Y);
1027+
Assert.AreEqual(300, n.Width);
1028+
Assert.AreEqual(400, n.Height);
10291029
}
10301030

10311031
[Test]

0 commit comments

Comments
 (0)