[mono-config] use right type for result of strlen

[mono.git] / mcs / class / System.Drawing / Test / System.Drawing / TestPoint.cs

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs
index 3d3f85fce7ad31e6dfc09d7d125b4a1f51a3249d..71bb2abec8baec2a81ab03ac491173456914a45d 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs
@@ -1,7 +1,7 @@
 // Tests for System.Drawing.Point.cs
 //
 // Author: Mike Kestner (mkestner@speakeasy.net)
-//                Improvements by Jordi Mas i Hernàndez <jmas@softcatala.org>
+//                Improvements by Jordi Mas i Hernandez <jmas@softcatala.org>
 // Copyright (c) 2001 Ximian, Inc.
 
 //
@@ -36,7 +36,7 @@ namespace MonoTests.System.Drawing{
 
        [TestFixture]   
        [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
-       public class PointTest : Assertion {
+       public class PointTest {
                Point pt1_1;
                Point pt1_0;
                Point pt0_1;
@@ -56,73 +56,73 @@ namespace MonoTests.System.Drawing{
                [Test]
                public void EqualsTest () 
                {
-                       AssertEquals (pt1_1, pt1_1);
-                       AssertEquals (pt1_1, new Point (1, 1));
-                       Assert (!pt1_1.Equals (pt1_0));
-                       Assert (!pt1_1.Equals (pt0_1));
-                       Assert (!pt1_0.Equals (pt0_1));
+                       Assert.AreEqual (pt1_1, pt1_1, "#1");
+                       Assert.AreEqual (pt1_1, new Point (1, 1), "#2");
+                       Assert.IsTrue (!pt1_1.Equals (pt1_0), "#3");
+                       Assert.IsTrue (!pt1_1.Equals (pt0_1), "#4");
+                       Assert.IsTrue (!pt1_0.Equals (pt0_1), "#5");
                }
                
                [Test]
                public void EqualityOpTest () 
                {
-                       Assert (pt1_1 == pt1_1);
-                       Assert (pt1_1 == new Point (1, 1));
-                       Assert (!(pt1_1 == pt1_0));
-                       Assert (!(pt1_1 == pt0_1));
-                       Assert (!(pt1_0 == pt0_1));
+                       Assert.IsTrue (pt1_1 == pt1_1, "#1");
+                       Assert.IsTrue (pt1_1 == new Point (1, 1), "#2");
+                       Assert.IsTrue (!(pt1_1 == pt1_0), "#3");
+                       Assert.IsTrue (!(pt1_1 == pt0_1), "#4");
+                       Assert.IsTrue (!(pt1_0 == pt0_1), "#5");
                }
 
                [Test]
                public void InequalityOpTest () 
                {
-                       Assert (!(pt1_1 != pt1_1));
-                       Assert (!(pt1_1 != new Point (1, 1)));
-                       Assert (pt1_1 != pt1_0);
-                       Assert (pt1_1 != pt0_1);
-                       Assert (pt1_0 != pt0_1);
+                       Assert.IsTrue (!(pt1_1 != pt1_1), "#1");
+                       Assert.IsTrue (!(pt1_1 != new Point (1, 1)), "#2");
+                       Assert.IsTrue (pt1_1 != pt1_0, "#3");
+                       Assert.IsTrue (pt1_1 != pt0_1, "#4");
+                       Assert.IsTrue (pt1_0 != pt0_1, "#5");
                }
        
                [Test]
                public void CeilingTest () 
                {
                        PointF ptf = new PointF (0.8f, 0.3f);
-                       AssertEquals (pt1_1, Point.Ceiling (ptf));
+                       Assert.AreEqual (pt1_1, Point.Ceiling (ptf), "#1");
                }
        
                [Test]
                public void RoundTest () 
                {
                        PointF ptf = new PointF (0.8f, 1.3f);
-                       AssertEquals (pt1_1, Point.Round (ptf));
+                       Assert.AreEqual (pt1_1, Point.Round (ptf), "#1");
                }
        
                [Test]
                public void TruncateTest () 
                {
                        PointF ptf = new PointF (0.8f, 1.3f);
-                       AssertEquals (pt0_1, Point.Truncate (ptf));
+                       Assert.AreEqual (pt0_1, Point.Truncate (ptf), "#1");
                }
        
                [Test]
                public void NullTest () 
                {
                        Point pt = new Point (0, 0);
-                       AssertEquals (pt, Point.Empty);
+                       Assert.AreEqual (pt, Point.Empty, "#1");
                }
        
                [Test]
                public void AdditionTest () 
                {
-                       AssertEquals (pt1_1, pt1_0 + new Size (0, 1));
-                       AssertEquals (pt1_1, pt0_1 + new Size (1, 0));
+                       Assert.AreEqual (pt1_1, pt1_0 + new Size (0, 1), "#1");
+                       Assert.AreEqual (pt1_1, pt0_1 + new Size (1, 0), "#2");
                }
        
                [Test]
                public void SubtractionTest () 
                {
-                       AssertEquals (pt1_0, pt1_1 - new Size (0, 1));
-                       AssertEquals (pt0_1, pt1_1 - new Size (1, 0));
+                       Assert.AreEqual (pt1_0, pt1_1 - new Size (0, 1), "#1");
+                       Assert.AreEqual (pt0_1, pt1_1 - new Size (1, 0), "#2");
                }
        
                [Test]
@@ -131,7 +131,7 @@ namespace MonoTests.System.Drawing{
                        Size sz1 = new Size (1, 1);
                        Size sz2 = (Size) pt1_1;
        
-                       AssertEquals (sz1, sz2);
+                       Assert.AreEqual (sz1, sz2, "#1");
                }
        
                [Test]
@@ -140,7 +140,7 @@ namespace MonoTests.System.Drawing{
                        PointF ptf1 = new PointF (1, 1);
                        PointF ptf2 = pt1_1;
        
-                       AssertEquals (ptf1, ptf2);
+                       Assert.AreEqual (ptf1, ptf2, "#1");
                }
        
                [Test]
@@ -151,9 +151,9 @@ namespace MonoTests.System.Drawing{
                        Point pt_i = new Point (i);
                        Point pt_sz = new Point (sz);
        
-                       AssertEquals (pt_i, pt_sz);
-                       AssertEquals (pt_i, pt1_1);
-                       AssertEquals (pt_sz, pt1_1);
+                       Assert.AreEqual (pt_i, pt_sz, "#1");
+                       Assert.AreEqual (pt_i, pt1_1, "#2");
+                       Assert.AreEqual (pt_sz, pt1_1, "#3");
                }
                
                [Test]
@@ -161,10 +161,10 @@ namespace MonoTests.System.Drawing{
                {
                        Point pt = new Point (0, 0);
        
-                       Assert (pt.IsEmpty);
-                       Assert (!pt1_1.IsEmpty);
-                       AssertEquals (1, pt1_0.X);
-                       AssertEquals (1, pt0_1.Y);
+                       Assert.IsTrue (pt.IsEmpty, "#1");
+                       Assert.IsTrue (!pt1_1.IsEmpty, "#2");
+                       Assert.AreEqual (1, pt1_0.X, "#3");
+                       Assert.AreEqual (1, pt0_1.Y, "#4");
                }
                
                [Test]
@@ -172,37 +172,36 @@ namespace MonoTests.System.Drawing{
                {
                        Point pt = new Point (0, 0);
                        pt.Offset (0, 1);
-                       AssertEquals (pt, pt0_1);
+                       Assert.AreEqual (pt, pt0_1, "#1");
                        pt.Offset (1, 0);
-                       AssertEquals (pt, pt1_1);
+                       Assert.AreEqual (pt, pt1_1, "#2");
                        pt.Offset (0, -1);
-                       AssertEquals (pt, pt1_0);
+                       Assert.AreEqual (pt, pt1_0, "#3");
                }
                
                [Test]
                public void GetHashCodeTest ()
                {
-                       AssertEquals (0, pt1_1.GetHashCode ());
-                       AssertEquals (1, pt1_0.GetHashCode ());
-                       AssertEquals (1, pt0_1.GetHashCode ());
+                       Assert.AreEqual (0, pt1_1.GetHashCode (), "#1");
+                       Assert.AreEqual (1, pt1_0.GetHashCode (), "#2");
+                       Assert.AreEqual (1, pt0_1.GetHashCode (), "#3");
                        Point pt = new Point(0xFF, 0xFF00);
-                       AssertEquals (0xFFFF, pt.GetHashCode ());
+                       Assert.AreEqual (0xFFFF, pt.GetHashCode (), "#4");
                }
 
                [Test]
                public void ToStringTest ()
                {
-                       AssertEquals ("{X=1,Y=1}", pt1_1.ToString ());
-                       AssertEquals ("{X=1,Y=0}", pt1_0.ToString ());
-                       AssertEquals ("{X=0,Y=1}", pt0_1.ToString ());
+                       Assert.AreEqual ("{X=1,Y=1}", pt1_1.ToString (), "#1");
+                       Assert.AreEqual ("{X=1,Y=0}", pt1_0.ToString (), "#2");
+                       Assert.AreEqual ("{X=0,Y=1}", pt0_1.ToString (), "#3");
                }
-#if NET_2_0
 
                [Test]
                public void AddTest ()
                {
-                       AssertEquals (pt1_1, Point.Add (pt1_0, new Size (0, 1)));
-                       AssertEquals (pt1_1, Point.Add (pt0_1, new Size (1, 0)));                       
+                       Assert.AreEqual (pt1_1, Point.Add (pt1_0, new Size (0, 1)), "#1");
+                       Assert.AreEqual (pt1_1, Point.Add (pt0_1, new Size (1, 0)), "#2");
                }
 
                [Test]
@@ -210,20 +209,19 @@ namespace MonoTests.System.Drawing{
                {
                        Point pt = new Point (0, 0);
                        pt.Offset (new Point (0, 1));
-                       AssertEquals (pt, pt0_1);
+                       Assert.AreEqual (pt, pt0_1, "#1");
                        pt.Offset (new Point (1, 0));
-                       AssertEquals (pt, pt1_1);
+                       Assert.AreEqual (pt, pt1_1, "#2");
                        pt.Offset (new Point (0, -1));
-                       AssertEquals (pt, pt1_0);
+                       Assert.AreEqual (pt, pt1_0, "#3");
                }
 
                [Test]
                public void SubtractTest ()
                {
-                       AssertEquals (pt1_0, Point.Subtract (pt1_1, new Size (0, 1)));
-                       AssertEquals (pt0_1, Point.Subtract (pt1_1, new Size (1, 0)));
+                       Assert.AreEqual (pt1_0, Point.Subtract (pt1_1, new Size (0, 1)), "#1");
+                       Assert.AreEqual (pt0_1, Point.Subtract (pt1_1, new Size (1, 0)), "#2");
                }
-#endif
 
        }
 }