14 files changed, 18 insertions, 122 deletions

diff --git a/mcs/class/corlib/System.Collections/ChangeLog b/mcs/class/corlib/System.Collections/ChangeLog
index 2eb7086542e..637d306a004 100644
--- a/mcs/class/corlib/System.Collections/ChangeLog
+++ b/mcs/class/corlib/System.Collections/ChangeLog
@@ -1,7 +1,3 @@
-2004-05-31  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* Hashtable.cs: Added ArgumentNullException in GetObjectData.
-
 2004-05-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* ChangeLog:
diff --git a/mcs/class/corlib/System.Collections/Hashtable.cs b/mcs/class/corlib/System.Collections/Hashtable.cs
index 4e5d97dbdc8..87ff1fd77e5 100644
--- a/mcs/class/corlib/System.Collections/Hashtable.cs
+++ b/mcs/class/corlib/System.Collections/Hashtable.cs
@@ -431,9 +431,6 @@ namespace System.Collections {
 
 		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
 		{
-			if (info == null)
-				throw new ArgumentNullException ("info");
-
 			info.AddValue ("LoadFactor", loadFactor);
 			info.AddValue ("Version", modificationCount);
 			info.AddValue ("Comparer", comparerRef);
diff --git a/mcs/class/corlib/System.Reflection/common.src b/mcs/class/corlib/System.Reflection/common.src
deleted file mode 100644
index 022b6768fcc..00000000000
--- a/mcs/class/corlib/System.Reflection/common.src
+++ /dev/null
@@ -1,25 +0,0 @@
-Assembly.cs
-AssemblyNameFlags.cs
-BindingFlags.cs
-CallingConventions.cs
-ConstructorInfo.cs
-DefaultMemberAttribute.cs
-EventAttributes.cs
-EventInfo.cs
-FieldAttributes.cs
-FieldInfo.cs
-ICustomAttributeProvider.cs
-MemberFilter.cs
-MemberInfo.cs
-MemberTypes.cs
-MethodAttributes.cs
-MethodBase.cs
-MethodImplAttributes.cs
-MethodInfo.cs
-Module.cs
-ParameterAttributes.cs
-PropertyAttributes.cs
-PropertyInfo.cs
-ResourceAttributes.cs
-ResourceLocation.cs
-TypeAttributes.cs
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 3da1a948d8b..e360292865c 100644
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* String.cs: Flag concat with four arguments internal. 
+
 2004-05-31  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* Array.cs: Fixed legal case where value is null.
diff --git a/mcs/class/corlib/System/String.cs b/mcs/class/corlib/System/String.cs
index 083fba9238d..04c65d76bd1 100644
--- a/mcs/class/corlib/System/String.cs
+++ b/mcs/class/corlib/System/String.cs
@@ -967,7 +967,10 @@ namespace System
 			return Concat (s1, s2, s3);
 		}
 
-		public static String Concat (Object obj1, Object obj2, Object obj3, Object obj4)
+		//
+		// Do *not* remove `internal' from that method
+		//
+		internal static String Concat (Object obj1, Object obj2, Object obj3, Object obj4)
 		{
 			string s1, s2, s3, s4;
 
diff --git a/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs b/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs
index 7174634ad5e..9c257846f3b 100644
--- a/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs
@@ -418,14 +418,6 @@ public class ArrayListTest : Assertion {
 		al.BinarySearch (1, Int32.MaxValue, this, null);

 	}

 

-	[Test]

-	public void BinarySearch_Null () 

-	{

-		ArrayList al = new ArrayList ();

-		al.Add (this);

-		AssertEquals ("null", -1, al.BinarySearch (null));

-	}

-

 	// TODO - BinarySearch with IComparer

 

 	public void TestClear() {

diff --git a/mcs/class/corlib/Test/System.Collections/ChangeLog b/mcs/class/corlib/Test/System.Collections/ChangeLog
index 80529ff8a04..1c7e4958359 100644
--- a/mcs/class/corlib/Test/System.Collections/ChangeLog
+++ b/mcs/class/corlib/Test/System.Collections/ChangeLog
@@ -1,8 +1,3 @@
-2004-05-31  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* ArrayListTest.cs: Added new test for null in BinarySearch.
-	* HashtableTest.cs: Added null checking fro GetObjectData.
-
 2004-05-27  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* HashtableTest.cs: Added case where a cloned hashtable must also be
diff --git a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
index f05c15c831f..f883779af8e 100644
--- a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
@@ -778,13 +778,5 @@ public class HashtableTest : Assertion {
 		Assert (!e.MoveNext ());

 

 	}

-

-	[Test]

-	[ExpectedException (typeof (ArgumentNullException))]

-	public void GetObjectData_NullSerializationInfo () 

-	{

-		SetDefaultData ();

-		ht.GetObjectData (null, new StreamingContext ());

-	}

 }

 }

diff --git a/mcs/class/corlib/Test/System.IO/ChangeLog b/mcs/class/corlib/Test/System.IO/ChangeLog
index 4def9b5fad8..59e9e3a5172 100644
--- a/mcs/class/corlib/Test/System.IO/ChangeLog
+++ b/mcs/class/corlib/Test/System.IO/ChangeLog
@@ -1,11 +1,3 @@
-2004-05-31  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* FileTest.cs: Added tests to confirm that Exists never throws
-	exceptions even for invalid filenames or for unexisting directories.
-	* PathTest.cs: Added windows-specific tests that shows that 
-	ChangeExtension validate the input patch but doesn't validate the 
-	resulting path.
-
 2004-05-30  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* BufferedStreamTest.cs: Added tests for Position after SetLength, 
diff --git a/mcs/class/corlib/Test/System.IO/FileTest.cs b/mcs/class/corlib/Test/System.IO/FileTest.cs
index 21f11655f87..816ac079bda 100644
--- a/mcs/class/corlib/Test/System.IO/FileTest.cs
+++ b/mcs/class/corlib/Test/System.IO/FileTest.cs
@@ -65,18 +65,8 @@ namespace MonoTests.System.IO
 					s.Close ();
 				DeleteFile (path);
 			}
-		}
-
-		[Test]
-		public void Exists_InvalidFileName () 
-		{
-			Assert ("><|", !File.Exists ("><|"));
-		}
-
-		[Test]
-		public void Exists_InvalidDirectory () 
-		{
-			Assert ("InvalidDirectory", !File.Exists (Path.Combine ("does not exist", "file.txt")));
+			
+			
 		}
 
 		[Test]
diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs
index 179cbd1e965..4d23ef35fb2 100644
--- a/mcs/class/corlib/Test/System.IO/PathTest.cs
+++ b/mcs/class/corlib/Test/System.IO/PathTest.cs
@@ -129,23 +129,15 @@ namespace MonoTests.System.IO
 			AssertEquals ("ChangeExtension #17", String.Empty, testPath);
 			testPath = Path.ChangeExtension (null, null);
 			AssertNull ("ChangeExtension #18", testPath);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void ChangeExtension_BadPath () 
-		{
-			if (!Windows) throw new ArgumentException ("Test Only On Windows");
-			Path.ChangeExtension ("<", ".extension");
-		}
 
-		[Test]
-//		[ExpectedException (typeof (ArgumentException))]
-		public void ChangeExtension_BadExtension () 
-		{
-			if (!Windows) throw new ArgumentException ("Test Only On Windows");
-			string fn = Path.ChangeExtension ("file.ext", "<");
-			AssertEquals ("Invalid filename", "file.<", fn);
+			if (Windows) {
+				try {
+					testPath = Path.ChangeExtension ("<", ".extension");
+					Fail ("ChangeException Fail #01");
+				} catch (Exception e) {
+					AssertEquals ("ChangeExtension Exc. #01", typeof (ArgumentException), e.GetType ());
+				}
+			}
 		}
 
 		public void TestCombine ()
diff --git a/mcs/class/corlib/Test/System/ArrayTest.cs b/mcs/class/corlib/Test/System/ArrayTest.cs
index d768519ef6d..a10305286d7 100644
--- a/mcs/class/corlib/Test/System/ArrayTest.cs
+++ b/mcs/class/corlib/Test/System/ArrayTest.cs
@@ -203,22 +203,6 @@ public class ArrayTest : Assertion
 		AssertEquals("#B30", 49, Array.BinarySearch(array, 10));
 	}
 
-	[Test]
-	public void BinarySearch_NullValue () 
-	{
-		int[] array = new int[1];
-		AssertEquals ("I=a,o", -1, Array.BinarySearch (array, null));
-		AssertEquals ("I=a,o,c", -1, Array.BinarySearch (array, null, null));
-		AssertEquals ("I=a,i,i,o", -1, Array.BinarySearch (array, 0, 1, null));
-		AssertEquals ("I=a,i,i,o,c", -1, Array.BinarySearch (array, 0, 1, null,null));
-
-		object[] o = new object [3] { this, this, null };
-		AssertEquals ("O=a,o", -1, Array.BinarySearch (array, null));
-		AssertEquals ("O=a,o,c", -1, Array.BinarySearch (array, null, null));
-		AssertEquals ("O=a,i,i,o", -1, Array.BinarySearch (array, 0, 3, null));
-		AssertEquals ("O=a,i,i,o,c", -1, Array.BinarySearch (array, 0, 3, null, null));
-	}
-
 	// TODO - testBinarySearch with explicit IComparer args
 
 	[Test]
diff --git a/mcs/class/corlib/Test/System/ByteTest.cs b/mcs/class/corlib/Test/System/ByteTest.cs
index 6a0abcf77e4..10a3b9eb7d9 100644
--- a/mcs/class/corlib/Test/System/ByteTest.cs
+++ b/mcs/class/corlib/Test/System/ByteTest.cs
@@ -216,17 +216,6 @@ public class ByteTest : Assertion
 		}
 		
 	}
-
-	[Test]
-	public void ToString_Default () 
-	{
-		byte value = 255;
-		string def = value.ToString ("G");
-		string format = null;
-		AssertEquals ("null", def, value.ToString (format));
-		format = String.Empty;
-		AssertEquals ("empty", def, value.ToString (format));
-	}
 }
 
 }
diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
index 83c9881b919..f8eeaed8be7 100644
--- a/mcs/class/corlib/Test/System/ChangeLog
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -1,8 +1,3 @@
-2004-05-30  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* ArrayTest.cs: Added tests for null values in BinarySearch.
-	* Byte.cs: Added test for default ToString format value.
-
 2004-05-30  David Sheldon <dave-mono@earth.li>
 
   * DecimalTest.cs: Moved the rounding test that fails due to