Added test for bug fix #688940.

Test tries to open serial port with nonstandard baudrate,
particularly 1234. OutOfRange should be thrown. Test also
added to csproj.

diff --git a/mcs/class/System/Test/System.IO.Ports/SerialPortTest.cs b/mcs/class/System/Test/System.IO.Ports/SerialPortTest.cs
index dbb29a587f5f44bbd23ce0f78d11a9b5f8d2897c..33e4191b0cb1d2eca4beec97ab2b35364185a3eb 100644 (file)
--- a/mcs/class/System/Test/System.IO.Ports/SerialPortTest.cs
+++ b/mcs/class/System/Test/System.IO.Ports/SerialPortTest.cs
@@ -24,6 +24,7 @@
 //
 // Author:
 //     Carlos Alberto Cortez <calberto.cortez@gmail.com>
+//     Konrad M. Kruczynski
 //
 
 using System;
@@ -51,6 +52,24 @@ namespace MonoTests.System.IO.Ports
                        sp.DiscardNull = false;
                        Assert.AreEqual (false, sp.DiscardNull, "#C1");
                }
+
+               [Test]
+               public void NonstandardBaudRate ()
+               {
+                       int platform = (int) Environment.OSVersion.Platform;
+                       // we are testing on Unix only
+                       if ((platform != 4) && (platform != 128)) return;
+                       SerialPort sp = new SerialPort ();
+                       sp.BaudRate = 1234;
+                       var exceptionCatched = false;
+                       try {
+                               sp.Open();
+                       } catch(ArgumentOutOfRangeException) {
+                               exceptionCatched = true;
+                       }
+                       Assert.IsTrue(exceptionCatched,
+                               "Exception not thrown despite wrong baud rate");
+               }
        }
 }
 

diff --git a/mcs/class/System/Test/System.Test20.csproj b/mcs/class/System/Test/System.Test20.csproj
index 1feff881a3642f5aca1aa5e2adab3038951f1c60..b708e12e34b06899f73b7a2a24bc0c6e8b40b334 100644 (file)
--- a/mcs/class/System/Test/System.Test20.csproj
+++ b/mcs/class/System/Test/System.Test20.csproj
@@ -241,6 +241,7 @@
     <Compile Include="System.Configuration\SettingsPropertyValueTest.cs" />\r
     <Compile Include="System.IO.Compression\DeflateStreamTest.cs" />\r
     <Compile Include="System.IO.Compression\GzipStreamTest.cs" />\r
+    <Compile Include="System.IO.Ports\SerialPortTest.cs" />\r
     <Compile Include="System.Net.Configuration\ConnectionManagementSectionTest.cs" />\r
     <Compile Include="System.Net.Configuration\HttpWebRequestElementTest.cs" />\r
     <Compile Include="System.Net.Configuration\WebRequestModulesSectionTest.cs" />\r
@@ -326,7 +327,7 @@
     <Compile Include="System\UriTypeConverterTest.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\nunit20\framework\nunit.framework.dll20.J2EE.csproj">\r
+    <ProjectReference Include="..\..\..\nunit24\framework\nunit.framework.dll20.J2EE.csproj">\r
       <Project>{ACDA29DB-62AB-4AF8-8862-B3B4FC755BBC}</Project>\r
       <Name>nunit.framework.dll20.J2EE</Name>\r
     </ProjectReference>\r
@@ -365,4 +366,4 @@
       <UserProperties REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Drawing.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\jai_imageio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\jai_core.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\jai_codec.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\clibwrapper_jiio.jar;..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\mlibwrapper_jai.jar" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" REFS-JarPath-mscorlib="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Xml.jar" REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="" REFS-RefInfo-j2se-helpers="repository:vmw:framework:2.0" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
-</Project>
\ No newline at end of file
+</Project>\r