Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -99,7 +99,6 @@ namespace MonoTests.System.Drawing.Printing {
optionPtr = (IntPtr)((long)optionPtr + cupsOptionSize);
}
cupsFreeDests (1, destPtr);
return options;
}
@ -115,8 +114,9 @@ namespace MonoTests.System.Drawing.Printing {
var settings = new PrinterSettings () { PrinterName = PrinterSettings.InstalledPrinters [0] };
Assert.AreEqual (options ["PageSize"], settings.DefaultPageSettings.PaperSize.PaperName,
"Bug #602934 (https://bugzilla.novell.com/show_bug.cgi?id=602934) not fixed (PaperSize)");
Assert.AreEqual (options ["Resolution"], string.Format ("{0}dpi", settings.DefaultPageSettings.PrinterResolution.X),
"Bug #602934 (https://bugzilla.novell.com/show_bug.cgi?id=602934) not fixed (Resolution)");
if (options.ContainsKey("Resolution"))
Assert.AreEqual (options ["Resolution"], string.Format ("{0}dpi", settings.DefaultPageSettings.PrinterResolution.X),
"Bug #602934 (https://bugzilla.novell.com/show_bug.cgi?id=602934) not fixed (Resolution)");
}
#endregion