You've already forked linux-packaging-mono
Imported Upstream version 4.0.0~alpha1
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
@ -354,17 +354,9 @@ namespace MonoTests.System.Net
|
||||
} catch (ArgumentException ex) {
|
||||
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
|
||||
Assert.IsNotNull (ex.Message, "#3");
|
||||
#if NET_2_0
|
||||
Assert.IsFalse (ex.Message == "value", "#4");
|
||||
#else
|
||||
Assert.AreEqual ("value", ex.Message, "#4");
|
||||
#endif
|
||||
#if NET_2_0
|
||||
Assert.IsNotNull (ex.ParamName, "#5");
|
||||
Assert.AreEqual ("value", ex.ParamName, "#6");
|
||||
#else
|
||||
Assert.IsNull (ex.ParamName, "#5");
|
||||
#endif
|
||||
Assert.IsNull (ex.InnerException, "#7");
|
||||
}
|
||||
}
|
||||
@ -420,7 +412,6 @@ namespace MonoTests.System.Net
|
||||
try {
|
||||
fsA = req.GetRequestStream () as FileStream;
|
||||
Assert.IsNotNull (fsA, "#A1");
|
||||
#if NET_2_0
|
||||
try {
|
||||
req.GetRequestStream ();
|
||||
Assert.Fail ("#A2");
|
||||
@ -435,11 +426,6 @@ namespace MonoTests.System.Net
|
||||
// Cannot re-call BeginGetRequestStream/BeginGetResponse
|
||||
// while a previous call is still in progress.
|
||||
}
|
||||
#else
|
||||
fsB = req.GetRequestStream () as FileStream;
|
||||
Assert.IsNotNull (fsB, "#A2");
|
||||
Assert.AreSame (fsA, fsB, "#A3");
|
||||
#endif
|
||||
} finally {
|
||||
if (fsA != null)
|
||||
fsA.Close ();
|
||||
@ -454,7 +440,6 @@ namespace MonoTests.System.Net
|
||||
fsA = req.GetRequestStream () as FileStream;
|
||||
Assert.IsNotNull (fsA, "#B1");
|
||||
fsA.Close ();
|
||||
#if NET_2_0
|
||||
try {
|
||||
req.GetRequestStream ();
|
||||
Assert.Fail ("#B2");
|
||||
@ -469,11 +454,6 @@ namespace MonoTests.System.Net
|
||||
// Cannot re-call BeginGetRequestStream/BeginGetResponse
|
||||
// while a previous call is still in progress.
|
||||
}
|
||||
#else
|
||||
fsB = req.GetRequestStream () as FileStream;
|
||||
Assert.IsNotNull (fsB, "#B2");
|
||||
Assert.AreSame (fsA, fsB, "#B3");
|
||||
#endif
|
||||
} finally {
|
||||
if (fsA != null)
|
||||
fsA.Close ();
|
||||
@ -508,13 +488,10 @@ namespace MonoTests.System.Net
|
||||
Assert.IsNotNull (s, "#1:" + method);
|
||||
Assert.IsFalse (s.CanRead, "#2:" + method);
|
||||
Assert.IsTrue (s.CanSeek, "#3:" + method);
|
||||
#if NET_2_0
|
||||
Assert.IsFalse (s.CanTimeout, "#4:" + method);
|
||||
#endif
|
||||
Assert.IsTrue (s.CanWrite, "#5:" + method);
|
||||
Assert.AreEqual (0, s.Length, "#6:" + method);
|
||||
Assert.AreEqual (0, s.Position, "#7:" + method);
|
||||
#if NET_2_0
|
||||
try {
|
||||
int i = s.ReadTimeout;
|
||||
Assert.Fail ("#8:" + method + "=>" + i);
|
||||
@ -525,7 +502,6 @@ namespace MonoTests.System.Net
|
||||
Assert.Fail ("#9:" + method + "=>" + i);
|
||||
} catch (InvalidOperationException) {
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -586,16 +562,6 @@ namespace MonoTests.System.Net
|
||||
Assert.IsNull (ex.Response, "#4");
|
||||
Assert.IsNotNull (ex.InnerException, "#5");
|
||||
|
||||
#if ONLY_1_1
|
||||
FileNotFoundException fnf = ex.InnerException as FileNotFoundException;
|
||||
Assert.IsNotNull (fnf, "#6");
|
||||
Assert.AreEqual (typeof (FileNotFoundException), fnf.GetType (), "#7");
|
||||
Assert.IsNotNull (fnf.FileName, "#8");
|
||||
Assert.IsTrue (fnf.FileName.IndexOf ("FileWebRequestTest.tmp") != -1, "#9");
|
||||
Assert.IsNotNull (fnf.Message, "#10");
|
||||
Assert.IsTrue (fnf.Message.IndexOf ("FileWebRequestTest.tmp") != -1, "#11");
|
||||
Assert.IsNull (fnf.InnerException, "#12");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -623,11 +589,7 @@ namespace MonoTests.System.Net
|
||||
} catch (ArgumentException ex) {
|
||||
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
|
||||
Assert.IsNotNull (ex.Message, "#3");
|
||||
#if NET_2_0
|
||||
Assert.AreEqual ("value", ex.ParamName, "#4");
|
||||
#else
|
||||
Assert.IsNull (ex.ParamName, "#4");
|
||||
#endif
|
||||
Assert.IsNull (ex.InnerException, "#5");
|
||||
}
|
||||
}
|
||||
@ -642,11 +604,7 @@ namespace MonoTests.System.Net
|
||||
} catch (ArgumentException ex) {
|
||||
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
|
||||
Assert.IsNotNull (ex.Message, "#3");
|
||||
#if NET_2_0
|
||||
Assert.AreEqual ("value", ex.ParamName, "#4");
|
||||
#else
|
||||
Assert.IsNull (ex.ParamName, "#4");
|
||||
#endif
|
||||
Assert.IsNull (ex.InnerException, "#5");
|
||||
}
|
||||
}
|
||||
@ -702,11 +660,7 @@ namespace MonoTests.System.Net
|
||||
Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#3");
|
||||
Assert.IsNotNull (ex.Message, "#4");
|
||||
Assert.IsNotNull (ex.ParamName, "#5");
|
||||
#if NET_2_0
|
||||
Assert.IsFalse (ex.ParamName == "value", "#6");
|
||||
#else
|
||||
Assert.AreEqual ("value", ex.ParamName, "#6");
|
||||
#endif
|
||||
Assert.IsNull (ex.InnerException, "#7");
|
||||
}
|
||||
}
|
||||
@ -776,11 +730,7 @@ namespace MonoTests.System.Net
|
||||
case 8:
|
||||
Assert.AreEqual ("preauthenticate", entry.Name, "#B4:" + i);
|
||||
Assert.AreEqual (typeof (bool), entry.ObjectType, "#B5:" + i);
|
||||
#if NET_2_0
|
||||
Assert.AreEqual (false, entry.Value, "#B6:" + i);
|
||||
#else
|
||||
Assert.AreEqual (true, entry.Value, "#B6:" + i);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
i++;
|
||||
@ -828,11 +778,7 @@ namespace MonoTests.System.Net
|
||||
Assert.AreEqual ("image/png", req.ContentType, "#A3");
|
||||
Assert.IsNull (req.Credentials, "#A4");
|
||||
Assert.AreEqual ("PUT", req.Method, "#A5");
|
||||
#if NET_2_0
|
||||
Assert.IsFalse (req.PreAuthenticate, "#A6");
|
||||
#else
|
||||
Assert.IsTrue (req.PreAuthenticate, "#A6");
|
||||
#endif
|
||||
Assert.AreEqual ("file://test.txt/", req.RequestUri.AbsoluteUri, "#A7");
|
||||
Assert.AreEqual (20, req.Timeout, "#A8");
|
||||
|
||||
@ -877,7 +823,6 @@ namespace MonoTests.System.Net
|
||||
}
|
||||
|
||||
private static readonly byte [] _serialized = new byte [] {
|
||||
#if NET_2_0
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00,
|
||||
0x49, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2c, 0x20, 0x56, 0x65,
|
||||
@ -949,77 +894,6 @@ namespace MonoTests.System.Net
|
||||
0x00, 0x00, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x18, 0x68, 0x74, 0x74,
|
||||
0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x78,
|
||||
0x69, 0x6d, 0x69, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x0b
|
||||
#else
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00,
|
||||
0x4c, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2c, 0x20, 0x56, 0x65,
|
||||
0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x31, 0x2e, 0x30, 0x2e, 0x35,
|
||||
0x30, 0x30, 0x30, 0x2e, 0x30, 0x2c, 0x20, 0x43, 0x75, 0x6c, 0x74,
|
||||
0x75, 0x72, 0x65, 0x3d, 0x6e, 0x65, 0x75, 0x74, 0x72, 0x61, 0x6c,
|
||||
0x2c, 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
|
||||
0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3d, 0x62, 0x37, 0x37, 0x61, 0x35,
|
||||
0x63, 0x35, 0x36, 0x31, 0x39, 0x33, 0x34, 0x65, 0x30, 0x38, 0x39,
|
||||
0x05, 0x01, 0x00, 0x00, 0x00, 0x19, 0x53, 0x79, 0x73, 0x74, 0x65,
|
||||
0x6d, 0x2e, 0x4e, 0x65, 0x74, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x57,
|
||||
0x65, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x09, 0x00,
|
||||
0x00, 0x00, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x05,
|
||||
0x70, 0x72, 0x6f, 0x78, 0x79, 0x03, 0x75, 0x72, 0x69, 0x13, 0x63,
|
||||
0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x72,
|
||||
0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x06, 0x6d, 0x65, 0x74,
|
||||
0x68, 0x6f, 0x64, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
|
||||
0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x07, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x6f, 0x75, 0x74, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x41, 0x63, 0x63,
|
||||
0x65, 0x73, 0x73, 0x0f, 0x70, 0x72, 0x65, 0x61, 0x75, 0x74, 0x68,
|
||||
0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x04, 0x04, 0x04,
|
||||
0x01, 0x01, 0x00, 0x00, 0x03, 0x00, 0x1e, 0x53, 0x79, 0x73, 0x74,
|
||||
0x65, 0x6d, 0x2e, 0x4e, 0x65, 0x74, 0x2e, 0x57, 0x65, 0x62, 0x48,
|
||||
0x65, 0x61, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x02, 0x00, 0x00, 0x00, 0x13, 0x53, 0x79,
|
||||
0x73, 0x74, 0x65, 0x6d, 0x2e, 0x4e, 0x65, 0x74, 0x2e, 0x57, 0x65,
|
||||
0x62, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x02, 0x00, 0x00, 0x00, 0x0a,
|
||||
0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x55, 0x72, 0x69, 0x02,
|
||||
0x00, 0x00, 0x00, 0x09, 0x08, 0x14, 0x53, 0x79, 0x73, 0x74, 0x65,
|
||||
0x6d, 0x2e, 0x49, 0x4f, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x63,
|
||||
0x63, 0x65, 0x73, 0x73, 0x01, 0x02, 0x00, 0x00, 0x00, 0x09, 0x03,
|
||||
0x00, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0x00, 0x09, 0x05, 0x00,
|
||||
0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x03, 0x43, 0x47, 0x4e,
|
||||
0x06, 0x07, 0x00, 0x00, 0x00, 0x03, 0x50, 0x55, 0x54, 0x0a, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x04,
|
||||
0xf8, 0xff, 0xff, 0xff, 0x14, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d,
|
||||
0x2e, 0x49, 0x4f, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x63, 0x63,
|
||||
0x65, 0x73, 0x73, 0x01, 0x00, 0x00, 0x00, 0x07, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x5f, 0x5f, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x01,
|
||||
0x05, 0x03, 0x00, 0x00, 0x00, 0x1e, 0x53, 0x79, 0x73, 0x74, 0x65,
|
||||
0x6d, 0x2e, 0x4e, 0x65, 0x74, 0x2e, 0x57, 0x65, 0x62, 0x48, 0x65,
|
||||
0x61, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x05, 0x00, 0x00, 0x00, 0x05, 0x43, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x01, 0x30, 0x01, 0x32, 0x01, 0x31, 0x01, 0x33, 0x00,
|
||||
0x01, 0x01, 0x01, 0x01, 0x08, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00,
|
||||
0x00, 0x00, 0x06, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x43, 0x6f, 0x6e,
|
||||
0x74, 0x65, 0x6e, 0x74, 0x2d, 0x54, 0x79, 0x70, 0x65, 0x06, 0x0a,
|
||||
0x00, 0x00, 0x00, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x70,
|
||||
0x6e, 0x67, 0x06, 0x0b, 0x00, 0x00, 0x00, 0x0b, 0x44, 0x69, 0x73,
|
||||
0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x06, 0x0c, 0x00,
|
||||
0x00, 0x00, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x05, 0x04,
|
||||
0x00, 0x00, 0x00, 0x13, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e,
|
||||
0x4e, 0x65, 0x74, 0x2e, 0x57, 0x65, 0x62, 0x50, 0x72, 0x6f, 0x78,
|
||||
0x79, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x5f, 0x42, 0x79, 0x70, 0x61,
|
||||
0x73, 0x73, 0x4f, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x0d, 0x5f,
|
||||
0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
|
||||
0x73, 0x0b, 0x5f, 0x42, 0x79, 0x70, 0x61, 0x73, 0x73, 0x4c, 0x69,
|
||||
0x73, 0x74, 0x00, 0x04, 0x02, 0x01, 0x0a, 0x53, 0x79, 0x73, 0x74,
|
||||
0x65, 0x6d, 0x2e, 0x55, 0x72, 0x69, 0x02, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x00, 0x09, 0x0d, 0x00, 0x00, 0x00, 0x0a, 0x05,
|
||||
0x05, 0x00, 0x00, 0x00, 0x0a, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d,
|
||||
0x2e, 0x55, 0x72, 0x69, 0x01, 0x00, 0x00, 0x00, 0x0b, 0x41, 0x62,
|
||||
0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x55, 0x72, 0x69, 0x01, 0x02,
|
||||
0x00, 0x00, 0x00, 0x06, 0x0e, 0x00, 0x00, 0x00, 0x10, 0x66, 0x69,
|
||||
0x6c, 0x65, 0x3a, 0x2f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74,
|
||||
0x78, 0x74, 0x2f, 0x01, 0x0d, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
|
||||
0x00, 0x06, 0x0f, 0x00, 0x00, 0x00, 0x18, 0x68, 0x74, 0x74, 0x70,
|
||||
0x3a, 0x2f, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x78, 0x69,
|
||||
0x6d, 0x69, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x0b
|
||||
#endif
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user