Skip to content

Commit

Permalink
Fix a few CRLF issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@harinath
harinath committed Sep 15, 2010
1 parent a4d4d76 commit a555eb2
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 180 deletions.
8 changes: 4 additions & 4 deletions mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/EventLogger.cs
View file
Expand Up @@ -129,10 +129,10 @@ public EventLogger (object item)
logCtor.DefineParameter (1, ParameterAttributes.None, "test");
logCtor.DefineParameter (2, ParameterAttributes.None, "obj");
ILGenerator logIL = logCtor.GetILGenerator ();

logIL.Emit (OpCodes.Ldarg_0);
logIL.Emit (OpCodes.Call, typeof (object).GetConstructor (Type.EmptyTypes));


logIL.Emit (OpCodes.Ldarg_0);
logIL.Emit (OpCodes.Call, typeof (object).GetConstructor (Type.EmptyTypes));

logIL.Emit (OpCodes.Ldarg_0);
logIL.Emit (OpCodes.Ldarg_1);
logIL.Emit (OpCodes.Stfld, logField);
Expand Down
350 changes: 175 additions & 175 deletions mcs/class/System/Test/System/UriTest2.cs
View file
Expand Up @@ -548,180 +548,180 @@ public void Bug496783 ()
Assert.AreEqual (uri.Port.ToString (), uri.GetComponents (UriComponents.StrongPort, UriFormat.Unescaped), "StrongPort");
Assert.AreEqual (uri.UserInfo, uri.GetComponents (UriComponents.UserInfo, UriFormat.Unescaped), "UserInfo");
}
#endif

[Test]
public void Merge_Query_Fragment ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name?moonlight");
Assert.AreEqual ("?moonlight", absolute.Query, "absolute.Query");

Uri merged = new Uri (absolute, "#mono");
Assert.AreEqual ("#mono", merged.Fragment, "merged.Fragment");
Assert.AreEqual ("?moonlight", merged.Query, "merged.Query");
Assert.AreEqual ("http://host/dir/subdir/weird;name?moonlight#mono", merged.ToString (), "merged.ToString");
}

[Test]
public void Merge_Query_Query ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name?moonlight");
Assert.AreEqual ("?moonlight", absolute.Query, "absolute.Query");

Uri merged = new Uri (absolute, "?moon");
Assert.AreEqual ("?moon", merged.Query, "merged.Query");
#if NET_4_0
Assert.AreEqual ("http://host/dir/subdir/weird;name?moon", merged.ToString (), "merged.ToString");
#else
Assert.AreEqual ("http://host/dir/subdir/?moon", merged.ToString (), "merged.ToString");
#endif
}

[Test]
public void Merge_Query_RelativePath ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name?moonlight");
Assert.AreEqual ("?moonlight", absolute.Query, "absolute.Query");

Uri merged = new Uri (absolute, "../");
Assert.AreEqual (String.Empty, merged.Query, "../Query");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "../ToString");

merged = new Uri (absolute, "..");
Assert.AreEqual (String.Empty, merged.Query, "..Query");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "..ToString");

merged = new Uri (absolute, "./");
Assert.AreEqual (String.Empty, merged.Query, "./Query");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), "./ToString");

merged = new Uri (absolute, ".");
Assert.AreEqual (String.Empty, merged.Query, ".Query");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), ".ToString");

merged = new Uri (absolute, "/");
Assert.AreEqual (String.Empty, merged.Query, "/Query");
Assert.AreEqual ("http://host/", merged.ToString (), "/ToString");

merged = new Uri (absolute, "index.html");
Assert.AreEqual (String.Empty, merged.Query, "index.html Query");
Assert.AreEqual ("http://host/dir/subdir/index.html", merged.ToString (), "index.html ToString");

merged = new Uri (absolute, "i");
Assert.AreEqual (String.Empty, merged.Query, "i Query");
Assert.AreEqual ("http://host/dir/subdir/i", merged.ToString (), "i ToString");

merged = new Uri (absolute, String.Empty);
Assert.AreEqual ("?moonlight", merged.Query, "Query");
Assert.AreEqual ("http://host/dir/subdir/weird;name?moonlight", merged.ToString (), "ToString");
}

[Test]
public void Merge_Fragment_RelativePath ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name#mono");
Assert.AreEqual ("#mono", absolute.Fragment, "absolute.Fragment");

Uri merged = new Uri (absolute, "../");
Assert.AreEqual (String.Empty, merged.Fragment, "../Fragment");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "../ToString");

merged = new Uri (absolute, "..");
Assert.AreEqual (String.Empty, merged.Fragment, "..Fragment");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "..ToString");

merged = new Uri (absolute, "./");
Assert.AreEqual (String.Empty, merged.Fragment, "./Fragment");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), "./ToString");

merged = new Uri (absolute, ".");
Assert.AreEqual (String.Empty, merged.Fragment, ".Fragment");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), ".ToString");

merged = new Uri (absolute, "/");
Assert.AreEqual (String.Empty, merged.Fragment, "/Fragment");
Assert.AreEqual ("http://host/", merged.ToString (), "/ToString");

merged = new Uri (absolute, "index.html");
Assert.AreEqual (String.Empty, merged.Fragment, "index.html Fragment");
Assert.AreEqual ("http://host/dir/subdir/index.html", merged.ToString (), "index.html ToString");

merged = new Uri (absolute, "i");
Assert.AreEqual (String.Empty, merged.Fragment, "i Fragment");
Assert.AreEqual ("http://host/dir/subdir/i", merged.ToString (), "i ToString");

merged = new Uri (absolute, String.Empty);
Assert.AreEqual ("#mono", merged.Fragment, "Fragment");
Assert.AreEqual ("http://host/dir/subdir/weird;name#mono", merged.ToString (), "ToString");
}

[Test]
public void Host_Drive ()
{
Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName ("c:"), "c:");
Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("c"), "c");

Uri uri = new Uri ("http://c:/dir/subdir/file");
Assert.AreEqual ("c", uri.Authority, "http.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "http.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "http.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "http.HostNameType");
Assert.AreEqual ("http://c/dir/subdir/file", uri.ToString (), "http.ToString");

uri = new Uri ("https://c:/dir/subdir/file");
Assert.AreEqual ("c", uri.Authority, "https.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "https.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "https.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "https.HostNameType");
Assert.AreEqual ("https://c/dir/subdir/file", uri.ToString (), "https.ToString");

uri = new Uri ("ftp://c:/dir/subdir/file");
Assert.AreEqual ("c", uri.Authority, "ftp.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "ftp.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "ftp.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "ftp.HostNameType");
Assert.AreEqual ("ftp://c/dir/subdir/file", uri.ToString (), "ftp.ToString");

uri = new Uri ("nntp://c:/123456@c");
Assert.AreEqual ("c", uri.Authority, "nntp.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "nntp.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "nntp.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "nntp.HostNameType");
Assert.AreEqual ("nntp://c/123456@c", uri.ToString (), "nntp.ToString");

uri = new Uri ("file://c:/dir/subdir/file");
Assert.AreEqual (String.Empty, uri.Authority, "file.Authority");
Assert.AreEqual (String.Empty, uri.DnsSafeHost, "file.DnsSafeHost");
Assert.AreEqual (String.Empty, uri.Host, "file.Host");
Assert.AreEqual (UriHostNameType.Basic, uri.HostNameType, "file.HostNameType");
Assert.AreEqual ("file:///c:/dir/subdir/file", uri.ToString (), "file.ToString");
}

[Test]
public void UnknownScheme ()
{
Uri uri = new Uri ("mono:c:\\dir\\subdir\\file");
Assert.IsFalse (uri.IsWellFormedOriginalString (), "IsWellFormedOriginalString");
Assert.AreEqual (String.Empty, uri.Host, "Host");
Assert.AreEqual ("c:\\dir\\subdir\\file", uri.LocalPath, "LocalPath");

uri = new Uri ("mono://host/dir/subdir/file");
Assert.IsTrue (uri.IsWellFormedOriginalString (), "2/IsWellFormedOriginalString");
Assert.AreEqual ("host", uri.Host, "2/Host");
Assert.AreEqual ("/dir/subdir/file", uri.AbsolutePath, "2/AbsolutePath");
Assert.AreEqual ("/dir/subdir/file", uri.LocalPath, "2/LocalPath");

uri = new Uri ("mono:///host/dir/subdir/file");
Assert.IsTrue (uri.IsWellFormedOriginalString (), "3/IsWellFormedOriginalString");
Assert.AreEqual (String.Empty, uri.Host, "3/Host");
Assert.AreEqual ("/host/dir/subdir/file", uri.AbsolutePath, "3/AbsolutePath");
Assert.AreEqual ("/host/dir/subdir/file", uri.LocalPath, "3/LocalPath");

uri = new Uri ("mono:////host/dir/subdir/file");
Assert.IsTrue (uri.IsWellFormedOriginalString (), "4/IsWellFormedOriginalString");
Assert.AreEqual (String.Empty, uri.Host, "4/Host");
Assert.AreEqual ("//host/dir/subdir/file", uri.AbsolutePath, "4/AbsolutePath");
Assert.AreEqual ("//host/dir/subdir/file", uri.LocalPath, "4/LocalPath");
}
#endif

[Test]
public void Merge_Query_Fragment ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name?moonlight");
Assert.AreEqual ("?moonlight", absolute.Query, "absolute.Query");

Uri merged = new Uri (absolute, "#mono");
Assert.AreEqual ("#mono", merged.Fragment, "merged.Fragment");
Assert.AreEqual ("?moonlight", merged.Query, "merged.Query");
Assert.AreEqual ("http://host/dir/subdir/weird;name?moonlight#mono", merged.ToString (), "merged.ToString");
}

[Test]
public void Merge_Query_Query ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name?moonlight");
Assert.AreEqual ("?moonlight", absolute.Query, "absolute.Query");

Uri merged = new Uri (absolute, "?moon");
Assert.AreEqual ("?moon", merged.Query, "merged.Query");
#if NET_4_0
Assert.AreEqual ("http://host/dir/subdir/weird;name?moon", merged.ToString (), "merged.ToString");
#else
Assert.AreEqual ("http://host/dir/subdir/?moon", merged.ToString (), "merged.ToString");
#endif
}

[Test]
public void Merge_Query_RelativePath ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name?moonlight");
Assert.AreEqual ("?moonlight", absolute.Query, "absolute.Query");

Uri merged = new Uri (absolute, "../");
Assert.AreEqual (String.Empty, merged.Query, "../Query");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "../ToString");

merged = new Uri (absolute, "..");
Assert.AreEqual (String.Empty, merged.Query, "..Query");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "..ToString");

merged = new Uri (absolute, "./");
Assert.AreEqual (String.Empty, merged.Query, "./Query");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), "./ToString");

merged = new Uri (absolute, ".");
Assert.AreEqual (String.Empty, merged.Query, ".Query");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), ".ToString");

merged = new Uri (absolute, "/");
Assert.AreEqual (String.Empty, merged.Query, "/Query");
Assert.AreEqual ("http://host/", merged.ToString (), "/ToString");

merged = new Uri (absolute, "index.html");
Assert.AreEqual (String.Empty, merged.Query, "index.html Query");
Assert.AreEqual ("http://host/dir/subdir/index.html", merged.ToString (), "index.html ToString");

merged = new Uri (absolute, "i");
Assert.AreEqual (String.Empty, merged.Query, "i Query");
Assert.AreEqual ("http://host/dir/subdir/i", merged.ToString (), "i ToString");

merged = new Uri (absolute, String.Empty);
Assert.AreEqual ("?moonlight", merged.Query, "Query");
Assert.AreEqual ("http://host/dir/subdir/weird;name?moonlight", merged.ToString (), "ToString");
}

[Test]
public void Merge_Fragment_RelativePath ()
{
Uri absolute = new Uri ("http://host/dir/subdir/weird;name#mono");
Assert.AreEqual ("#mono", absolute.Fragment, "absolute.Fragment");

Uri merged = new Uri (absolute, "../");
Assert.AreEqual (String.Empty, merged.Fragment, "../Fragment");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "../ToString");

merged = new Uri (absolute, "..");
Assert.AreEqual (String.Empty, merged.Fragment, "..Fragment");
Assert.AreEqual ("http://host/dir/", merged.ToString (), "..ToString");

merged = new Uri (absolute, "./");
Assert.AreEqual (String.Empty, merged.Fragment, "./Fragment");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), "./ToString");

merged = new Uri (absolute, ".");
Assert.AreEqual (String.Empty, merged.Fragment, ".Fragment");
Assert.AreEqual ("http://host/dir/subdir/", merged.ToString (), ".ToString");

merged = new Uri (absolute, "/");
Assert.AreEqual (String.Empty, merged.Fragment, "/Fragment");
Assert.AreEqual ("http://host/", merged.ToString (), "/ToString");

merged = new Uri (absolute, "index.html");
Assert.AreEqual (String.Empty, merged.Fragment, "index.html Fragment");
Assert.AreEqual ("http://host/dir/subdir/index.html", merged.ToString (), "index.html ToString");

merged = new Uri (absolute, "i");
Assert.AreEqual (String.Empty, merged.Fragment, "i Fragment");
Assert.AreEqual ("http://host/dir/subdir/i", merged.ToString (), "i ToString");

merged = new Uri (absolute, String.Empty);
Assert.AreEqual ("#mono", merged.Fragment, "Fragment");
Assert.AreEqual ("http://host/dir/subdir/weird;name#mono", merged.ToString (), "ToString");
}

[Test]
public void Host_Drive ()
{
Assert.AreEqual (UriHostNameType.Unknown, Uri.CheckHostName ("c:"), "c:");
Assert.AreEqual (UriHostNameType.Dns, Uri.CheckHostName ("c"), "c");

Uri uri = new Uri ("http://c:/dir/subdir/file");
Assert.AreEqual ("c", uri.Authority, "http.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "http.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "http.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "http.HostNameType");
Assert.AreEqual ("http://c/dir/subdir/file", uri.ToString (), "http.ToString");

uri = new Uri ("https://c:/dir/subdir/file");
Assert.AreEqual ("c", uri.Authority, "https.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "https.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "https.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "https.HostNameType");
Assert.AreEqual ("https://c/dir/subdir/file", uri.ToString (), "https.ToString");

uri = new Uri ("ftp://c:/dir/subdir/file");
Assert.AreEqual ("c", uri.Authority, "ftp.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "ftp.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "ftp.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "ftp.HostNameType");
Assert.AreEqual ("ftp://c/dir/subdir/file", uri.ToString (), "ftp.ToString");

uri = new Uri ("nntp://c:/123456@c");
Assert.AreEqual ("c", uri.Authority, "nntp.Authority");
Assert.AreEqual ("c", uri.DnsSafeHost, "nntp.DnsSafeHost");
Assert.AreEqual ("c", uri.Host, "nntp.Host");
Assert.AreEqual (UriHostNameType.Dns, uri.HostNameType, "nntp.HostNameType");
Assert.AreEqual ("nntp://c/123456@c", uri.ToString (), "nntp.ToString");

uri = new Uri ("file://c:/dir/subdir/file");
Assert.AreEqual (String.Empty, uri.Authority, "file.Authority");
Assert.AreEqual (String.Empty, uri.DnsSafeHost, "file.DnsSafeHost");
Assert.AreEqual (String.Empty, uri.Host, "file.Host");
Assert.AreEqual (UriHostNameType.Basic, uri.HostNameType, "file.HostNameType");
Assert.AreEqual ("file:///c:/dir/subdir/file", uri.ToString (), "file.ToString");
}

[Test]
public void UnknownScheme ()
{
Uri uri = new Uri ("mono:c:\\dir\\subdir\\file");
Assert.IsFalse (uri.IsWellFormedOriginalString (), "IsWellFormedOriginalString");
Assert.AreEqual (String.Empty, uri.Host, "Host");
Assert.AreEqual ("c:\\dir\\subdir\\file", uri.LocalPath, "LocalPath");

uri = new Uri ("mono://host/dir/subdir/file");
Assert.IsTrue (uri.IsWellFormedOriginalString (), "2/IsWellFormedOriginalString");
Assert.AreEqual ("host", uri.Host, "2/Host");
Assert.AreEqual ("/dir/subdir/file", uri.AbsolutePath, "2/AbsolutePath");
Assert.AreEqual ("/dir/subdir/file", uri.LocalPath, "2/LocalPath");

uri = new Uri ("mono:///host/dir/subdir/file");
Assert.IsTrue (uri.IsWellFormedOriginalString (), "3/IsWellFormedOriginalString");
Assert.AreEqual (String.Empty, uri.Host, "3/Host");
Assert.AreEqual ("/host/dir/subdir/file", uri.AbsolutePath, "3/AbsolutePath");
Assert.AreEqual ("/host/dir/subdir/file", uri.LocalPath, "3/LocalPath");

uri = new Uri ("mono:////host/dir/subdir/file");
Assert.IsTrue (uri.IsWellFormedOriginalString (), "4/IsWellFormedOriginalString");
Assert.AreEqual (String.Empty, uri.Host, "4/Host");
Assert.AreEqual ("//host/dir/subdir/file", uri.AbsolutePath, "4/AbsolutePath");
Assert.AreEqual ("//host/dir/subdir/file", uri.LocalPath, "4/LocalPath");
}
}
}
2 changes: 1 addition & 1 deletion mcs/errors/cs0154-3.cs
View file
Expand Up @@ -12,4 +12,4 @@ public static void Main ()
{
int i = new Test()[false];
}
}
}
1 change: 1 addition & 0 deletions mono/tests/.gitattributes
View file
Expand Up @@ -5,3 +5,4 @@
/load-missing.il -crlf
/mutexes.cs -crlf
/thread4.cs -crlf
/qt-instance.il -crlf
7 changes: 7 additions & 0 deletions mono/tests/verifier/.gitattributes
View file
@@ -1,3 +1,10 @@
/make_type_visibility_test.sh -crlf
/unverifiable_ldobj_with_generic_type_definition.il -crlf
/unverifiable_throw_with_unboxed_generic_argument.il -crlf
/invalid_argument_type.il -crlf
/invalid_ldtoken_field.il -crlf
/invalid_ldtoken_method.il -crlf
/invalid_ldtoken_type.il -crlf
/invalid_ldtoken_type_2.il -crlf
/invalid_ldtoken_type_3.il -crlf
/invalid_local_variable.il -crlf

0 comments on commit a555eb2

Please sign in to comment.