Tests refactoring for TARGET_JVM.

svn path=/trunk/mcs/; revision=56114

diff --git a/mcs/class/System.Drawing/Test/ChangeLog b/mcs/class/System.Drawing/Test/ChangeLog
index a6689572a7449da6d18a7ba0f1a443d3e33b3606..83d66580ac218a2b06b8e1006579130a397da9a0 100644 (file)
--- a/mcs/class/System.Drawing/Test/ChangeLog
+++ b/mcs/class/System.Drawing/Test/ChangeLog
@@ -1,3 +1,6 @@
+2006-01-25 Boris Kirzner <borisk@mainsoft.com>
+       * Test.vmwcsproj,Test.dotnet.csproj: added reference to NUnit projects.
+
 2006-01-23 Boris Kirzner <borisk@mainsoft.com>
        * Test.vmwcsproj: perform java output validation.
 

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/ChangeLog b/mcs/class/System.Drawing/Test/DrawingTest/ChangeLog
index 786c4d865ac7131908e85b3e153c04303cd83a35..11fd8a4f1a6af6bb97b95ef9d345d97b3ec9f90f 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/ChangeLog
+++ b/mcs/class/System.Drawing/Test/DrawingTest/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25     Boris Kirzner <borisk@mainsoft.com>
+       * System.Drawing.Test.dotnet.sln, System.Drawing.Test.sln: 
+       added NUnit projects.
+
 2005-08-08 Andrew Skiba <andrews@mainsoft.com>
 
        * System.Drawing.Test.dotnet.sln, System.Drawing.Test.sln: move projects to the parent dir

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
index 11c32993162cb51c40d408a5a093bcbf4c842abd..6520cf2fe719db3ab746d1aac1f7f84be21c78c1 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
+++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25 Boris Kirzner <borisk@mainsoft.com>\r
+       * DrawingTestHelper_java.vmwcsproj, DrawingTestHelper.csproj: \r
+       projects updates for TARGET_JVM.\r
+\r
 2006-01-23 Boris Kirzner <borisk@mainsoft.com>\r
        * DrawingTestHelper_java.vmwcsproj: include PDComparer.cs.\r
 \r

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj
index de72e10a61dcf454c76a6d82c6734b9397432112..784b95bf40215e1ee8c83760d71090bbe127152f 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj
+++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper.csproj
@@ -36,7 +36,7 @@
                     NoStdLib = "false"\r
                     NoWarn = "1595"\r
                     Optimize = "false"\r
-                    OutputPath = "..\bin\Debug_Java\"\r
+                    OutputPath = "bin\Debug\"\r
                     RegisterForComInterop = "false"\r
                     RemoveIntegerChecks = "false"\r
                     TreatWarningsAsErrors = "false"\r
@@ -87,14 +87,13 @@
                 />\r
                 <Reference\r
                     Name = "System.XML"\r
-                    AssemblyName = "System.XML"\r
+                    AssemblyName = "System.Xml"\r
                     HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"\r
                 />\r
                 <Reference\r
-                    Name = "nunit.framework"\r
-                    AssemblyName = "nunit.framework"\r
-                    HintPath = "..\..\..\..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.framework.dll"\r
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"\r
+                    Name = "nunit.framework.dll.J2EE"\r
+                    Project = "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"\r
+                    Package = "{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"\r
                 />\r
             </References>\r
         </Build>\r

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper_java.vmwcsproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper_java.vmwcsproj
index 61b6782cd399d6cc73a2d096a3b35c147eb62a96..619e0f6c8b8774f433b17191fa3a63913e9f9d90 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper_java.vmwcsproj
+++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper_java.vmwcsproj
@@ -8,14 +8,14 @@
                        </Settings>\r
                        <References>\r
                                <Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>\r
-                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4\rt.dll" Private="False"/>\r
                                <Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll" Private="False"/>\r
                                <Reference Name="System.Windows.Forms" AssemblyName="System.Windows.Forms" HintPath="..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"/>\r
                                <Reference Name="vmwutils" AssemblyName="vmwutils" HintPath="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\vmwutils.dll" Private="False"/>\r
                                <Reference Name="J2SE.Helpers" AssemblyName="J2SE.Helpers" HintPath="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\J2SE.Helpers.dll" Private="False"/>\r
                                <Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll" Private="False"/>\r
                                <Reference Name="Exocortex.DSP.v1.J2EE" Project="{8D602CEF-DC13-48F1-AF0C-F6201A634FD2}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
-                               <Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\nunit.framework.dll" Private="False"/>\r
+                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>\r
+                               <Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
                        </References>\r
                </Build>\r
                <Files>\r
@@ -25,6 +25,6 @@
                                <File RelPath="PDComparer.cs" SubType="Code" BuildAction="Compile"/>\r
                        </Include>\r
                </Files>\r
-               <UserProperties jarserver="ipa" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.drawing="C:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar" project.JDKType="1.4.2_05" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.vmwutils="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\vmwutils.jar" REFS.JarPath.j2se.helpers="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\J2SE.Helpers.jar"/>\r
+               <UserProperties REFS.JarPath.j2se.helpers="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\J2SE.Helpers.jar" REFS.JarPath.vmwutils="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\vmwutils.jar" REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" project.JDKType="1.5.0_05" REFS.JarPath.system.drawing="C:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar"/>\r
        </CSHARP>\r
-       <VisualMainWin><Project Prop2023="1.4.2_05" Prop2024="" Prop2026="" Prop2015="" Version="1.6.0" ProjectType="1"/><References/><Configs><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/></Configs></VisualMainWin></VisualStudioProject>\r
+       <VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>\r

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln b/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln
index c786bb02b1b1193bfe0675ed384c17bb57740cf5..165feff5022a6b2f80aae26119d0b481b79fd358 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln
+++ b/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.dotnet.sln
@@ -11,6 +11,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingTestHelper", "Drawin
        ProjectSection(ProjectDependencies) = postProject\r
        EndProjectSection\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll.J2EE", "..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll.J2EE", "..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll.J2EE", "..\..\..\..\nunit20\util\nunit.util.dll.J2EE.vmwcsproj", "{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.J2EE", "..\..\..\..\nunit20\nunit-console\nunit-console.J2EE.vmwcsproj", "{EE901CF2-A263-471C-AEE2-2400A7105ABE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfiguration) = preSolution\r
                Debug = Debug\r
@@ -43,6 +59,38 @@ Global
                {8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release.Build.0 = Release|.NET\r
                {8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release_Java.ActiveCfg = Release|.NET\r
                {8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}.Release_Java.Build.0 = Release|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.ActiveCfg = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.Build.0 = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.Build.0 = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.ActiveCfg = Debug_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.Build.0 = Debug_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release.ActiveCfg = Release_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release.Build.0 = Release_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.Build.0 = Release_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.ActiveCfg = Debug_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.Build.0 = Debug_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release.ActiveCfg = Release_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release.Build.0 = Release_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.Build.0 = Release_Java|.NET\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln b/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln
index dea52ef1fb53dd73833e818cb5832a521037f607..5f472abb9580f270e07a818fba91d10a02fbf62a 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln
+++ b/mcs/class/System.Drawing/Test/DrawingTest/System.Drawing.Test.sln
@@ -11,6 +11,22 @@ Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Test", "..\Test.vmwcsproj",
        ProjectSection(ProjectDependencies) = postProject\r
        EndProjectSection\r
 EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit-console.J2EE", "..\..\..\..\nunit20\nunit-console\nunit-console.J2EE.vmwcsproj", "{EE901CF2-A263-471C-AEE2-2400A7105ABE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.util.dll.J2EE", "..\..\..\..\nunit20\util\nunit.util.dll.J2EE.vmwcsproj", "{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfiguration) = preSolution\r
                Debug = Debug\r
@@ -36,6 +52,30 @@ Global
                {D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Debug_Java.Build.0 = Debug_Java|.NET\r
                {D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Release_Java.ActiveCfg = Release_Java|.NET\r
                {D92997D0-B8BD-49A8-A7D0-8B6043930A07}.Release_Java.Build.0 = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.ActiveCfg = Debug|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.Build.0 = Debug|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.Build.0 = Release_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.ActiveCfg = Debug|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.Build.0 = Debug|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.Build.0 = Release_Java|.NET\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Test/ChangeLog b/mcs/class/System.Drawing/Test/DrawingTest/Test/ChangeLog
index 1bb71f68bc2efabc73f8ea454cbdb56aae69c8c2..be36e2a7ce4a741201edf41808c73e9697efa139 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/Test/ChangeLog
+++ b/mcs/class/System.Drawing/Test/DrawingTest/Test/ChangeLog
@@ -1,3 +1,6 @@
+2006-01-25 Boris Kirzner <borisk@maonsoft.com>\r
+       * Graphics.cs: added #ifdef for TARGET_JVM.\r
+\r
 2006-01-22 Boris Kirzner <borisk@mainsoft.com>\r
        * Bitmap.cs, Brush.cs, Graphics.cs, GraphicsPath.cs, Image.cs, Pen.cs,\r
        Region.cs: tests refactoring.\r

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs b/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs
index 15ddb5fe2de99d2d95097d7a245bf46d53ff95b7..370f79ca856bcba38aadb542dd847a07ee0cf8fe 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs
+++ b/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs
@@ -2655,6 +2655,12 @@ namespace Test.Sys.Drawing.GraphicsFixtures {
                        base.DrawStringFloatFormat ();\r
                }\r
 \r
+               [Test]\r
+               [Category("NotWorking")]\r
+               public override void IsVisible4Float() {\r
+                       base.IsVisible4Float ();\r
+               }\r
+\r
                [Test]\r
                public override void MeasureCharacterRangesRegions() {\r
                        base.MeasureCharacterRangesRegions ();\r

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
index 75122b31a5088d99677b63ee9eae24c4c7a9bd07..6b27469b6fe1e8b81c53958f267fe34e12cc5017 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25 Boris Kirzner <borisk@mainsoft.com>
+       *TestBmpCodec.cs, TestImageAttributes.cs, TestImageCodecInfo.cs:
+       added #ifdef for TARGET_JVM.
+
 2005-11-13  Kornél Pál  <kornelpal@hotmail.com>
 
        * TestImageFormat.cs: Added ToStringTest.

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
index dac4ffe169504df83e38d5ec061e78f661c666d0..3effdcfc8bcb5602ff4f8c2b56c537f35e827fe1 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
@@ -82,6 +82,9 @@ namespace MonoTests.System.Drawing
                
                /* Checks bitmap features on a know 24-bits bitmap */
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void Bitmap24bitFeatures()
                {
                        string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");                     

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs
index 644458c6bb4c7206412bee1c2bad1276545c6607..7db25131cc9fb3ed3959042c992329b7e84c1b25 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs
@@ -67,6 +67,9 @@ namespace MonoTests.System.Drawing
 
                // Text Color Matrix processing
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void ColorMatrix ()
                {                       
                        Color clr_src, clr_rslt;

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageCodecInfo.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageCodecInfo.cs
index 39ef67ef733e641f1625be1e06cb427b7581f3b1..a6f477d521a01fe9d58c7bf524671200b8c605b1 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageCodecInfo.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageCodecInfo.cs
@@ -132,6 +132,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void BMPCodec()
                {
                        Guid g = new Guid ("557cf400-1a04-11d3-9a73-0000f81ef32e");
@@ -142,6 +145,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void GifCodec()
                {
                        Guid g = new Guid ("557cf402-1a04-11d3-9a73-0000f81ef32e");
@@ -152,6 +158,9 @@ namespace MonoTests.System.Drawing
                }
                
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void JpegCodec()
                {
                        Guid g = new Guid ("557cf401-1a04-11d3-9a73-0000f81ef32e");
@@ -162,6 +171,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void PngCodec()
                {
                        Guid g = new Guid ("557cf406-1a04-11d3-9a73-0000f81ef32e");

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog b/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
index 7e86b2ebafe54ac16c4bf7188c5436159b152a98..8356b5f2e0427600016df531081f79d8b79ed163 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-26 Boris Kirzner <borisk@mainsoft.com>
+       * ColorConverter.cs, TestBitmap.cs, TestIcon.cs, TestIconConverter.cs,
+       TestImageConverter.cs, TestPointConverter.cs, TestRectangleConverter.cs,
+       TestRegion.cs, TestSizeConverter.cs, TestStringFormat.cs: 
+       added #ifdef for TARGET_JVM.
+
 2006-01-23 Boris Kirzner <borisk@mainsoft.com>
        * TestBitmap.cs, TestFont.cs: #ifdef fot TARGET_JVM.    
 

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
index e581399ecadfcc9e3e0d4a66bb408d79dfb78e8a..0d42f95a74a42c988909ec8e44e041595fa705e3 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
@@ -34,6 +34,9 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void CanConvertFrom () {
                        Assert.IsTrue (colconv.CanConvertFrom (typeof (String)), "CCF#1");
                        Assert.IsTrue (colconv.CanConvertFrom (null, typeof (String)), "CCF#1a");
@@ -64,6 +67,9 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFrom ()
                {
                        Color color = (Color) colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -165,6 +171,9 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (Exception))]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFrom_x4 ()
                {
                        colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -323,6 +332,9 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromInvariantString_InvalidNumber ()
                {
                        try {
@@ -352,6 +364,9 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_InvalidNumber ()
                {
                        try {

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
index efae049bd436dc8827aeffa69eace7e5c1ab484c..92d0434f1552094e2b6c662801de639d1cd132a7 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
@@ -171,6 +171,9 @@ namespace MonoTests.System.Drawing{
                
                [Test]
                [ExpectedException (typeof (ArgumentException))]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void FileDoesNotExists ()
                {                       
                        Bitmap  bmp = new Bitmap ("FileDoesNotExists.jpg");                     
@@ -451,7 +454,7 @@ namespace MonoTests.System.Drawing{
                        Assert.AreEqual ("FFE86628478591D1A1EB30E894C34F", hash);                       
                        Assert.AreEqual ("8C2C04B361E1D5875EE8ACF5073F4E", hashchg);                            
                                                
-               }       
+               }
 
                /*
                        Tests the LockBitmap and UnlockBitmap functions, specifically the copying
@@ -549,6 +552,6 @@ namespace MonoTests.System.Drawing{
                                Assert.AreEqual (blue, bmp.GetPixel (0, 0));
                        }
                }
-#endif
+#endif         
        }
 }

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs
index 6b9bb2a299c87115d0cf26c91e3fe97926932b00..40b893f362760f0b579263d51f83072791fa63ba 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs
@@ -55,6 +55,9 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestConstructors ()
                {
                        newIcon = new Icon (fs1, 48, 48);
@@ -67,6 +70,9 @@ namespace MonoTests.System.Drawing{
                }                               
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestProperties ()
                {
                        Assert.AreEqual (32, icon.Height, "P#1");
@@ -77,6 +83,9 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestMethods ()
                {
                        /*

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs
index a588e8fe9a9426e25d496757b43dac530d6c3571..92c981881369dc7d10c5f9aaf6652da10a274891 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs
@@ -81,6 +81,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (icoConv.CanConvertFrom (typeof (byte [])), "CCF#1");
@@ -112,6 +115,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertTo ()
                {
                        Assert.IsTrue (icoConv.CanConvertTo (typeof (String)), "CCT#1");
@@ -145,6 +151,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertFrom ()
                {
                        Icon newIcon = (Icon) icoConv.ConvertFrom (null, CultureInfo.InvariantCulture, iconBytes);
@@ -255,6 +264,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertTo ()
                {
                        Assert.AreEqual (iconStr, (String) icoConv.ConvertTo (null,

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs
index 507522568977819716ca02066394d87bfdb0f869..46df68ba469d29e7b3a16acb5b46208d5a1e613b 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs
@@ -81,6 +81,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (imgConv.CanConvertFrom (typeof (byte [])), "CCF#1");
@@ -112,6 +115,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertTo ()
                {
                        Assert.IsTrue (imgConv.CanConvertTo (typeof (String)), "CCT#1");
@@ -145,6 +151,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertFrom ()
                {
                        Image newImage = (Image) imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, imageBytes);
@@ -256,6 +265,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertTo ()
                {
                        Assert.AreEqual (imageStr, (String) imgConv.ConvertTo (null,
@@ -422,6 +434,9 @@ namespace MonoTests.System.Drawing
 
                
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestGetPropertiesSupported ()
                {
                        Assert.IsTrue (imgConv.GetPropertiesSupported (), "GPS#1");
@@ -429,6 +444,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestGetProperties ()
                {
                        PropertyDescriptorCollection propsColl;

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs
index af3d2e32966320461c1661a3c44793d179d7fcac..788ed2c5fcf8013725641e8ca9fd3c4ecfdcdf03 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs
@@ -63,6 +63,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (ptconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -94,6 +97,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (pt, (Point) ptconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -264,6 +270,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -306,6 +315,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -319,6 +331,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -342,6 +357,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs
index dbc36ddd77919c00f2c6a60876468c6837827f40..459418b395caea7433e89d580dc79275f4be95a6 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs
@@ -69,6 +69,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (rconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -100,6 +103,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (rect, (Rectangle) rconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -324,6 +330,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -381,6 +390,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -394,6 +406,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -419,6 +434,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs
index b9c08b5963f8b89818d7d5a59749dcafc1610389..cd953b462b0bbab70ae2155cee17a59e7388e032 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs
@@ -85,6 +85,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestCloneAndEquals()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -119,6 +122,9 @@ namespace MonoTests.System.Drawing
 
                 /*Tests infinite, empty, etc*/
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestInfiniteAndEmpty()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -154,6 +160,9 @@ namespace MonoTests.System.Drawing
 
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestUnionGroup1 ()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -307,6 +316,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestUnionGroup2 ()
                {
                        RectangleF[] rects;
@@ -454,6 +466,9 @@ namespace MonoTests.System.Drawing
 
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestComplementGroup1 ()
                {
                        RectangleF[] rects;
@@ -558,6 +573,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestComplementGroup2 ()
                {
 
@@ -596,6 +614,9 @@ namespace MonoTests.System.Drawing
 
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestExcludeGroup1 ()
                {
                        RectangleF[] rects;
@@ -859,6 +880,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestExcludeGroup2 ()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -888,6 +912,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestIntersect()
                {
 
@@ -932,6 +959,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestXor()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -1021,6 +1051,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TestTranslate()
                {
                        Region rgn1 = new Region (new RectangleF (10, 10, 120,120));
@@ -1039,6 +1072,9 @@ namespace MonoTests.System.Drawing
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void Constructor_GraphicsPath_Null ()
                {
                        GraphicsPath gp = null;
@@ -1047,6 +1083,9 @@ namespace MonoTests.System.Drawing
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void Constructor_RegionData_Null ()
                {
                        RegionData rd = null;
@@ -1141,18 +1180,27 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_IntIntNull ()
                {
                        Assert.IsTrue (new Region ().IsVisible (0, 0, null));
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_IntIntIntIntNull ()
                {
                        Assert.IsFalse (new Region ().IsVisible (0, 0, 0, 0, null));
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_PointNull ()
                {
                        Point p = new Point ();
@@ -1160,6 +1208,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_PointFNull ()
                {
                        PointF p = new PointF ();
@@ -1167,6 +1218,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_RectangleNull ()
                {
                        Rectangle r = new Rectangle ();
@@ -1174,6 +1228,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_RectangleFNull ()
                {
                        RectangleF r = new RectangleF ();
@@ -1181,12 +1238,18 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_SingleSingleNull ()
                {
                        Assert.IsTrue (new Region ().IsVisible (0f, 0f, null));
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void IsVisible_SingleSingleSingleSingleNull ()
                {
                        Assert.IsFalse (new Region ().IsVisible (0f, 0f, 0f, 0f, null));
@@ -1207,6 +1270,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                [ExpectedException (typeof (ArgumentNullException))]
                public void Equals_NullGraphics ()
                {
@@ -1229,6 +1295,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                [ExpectedException (typeof (ArgumentNullException))]
                public void GetRegionScans_Null ()
                {
@@ -1256,6 +1325,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void Region_Empty ()
                {
                        Region region = new Region ();

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs
index 22592590fa648b70663f325e8652cc7b0c4faa09..c1cee53cc36d8873a6443b1838496b68618b20d3 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs
@@ -64,6 +64,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (szconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -95,6 +98,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (sz, (Size) szconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -267,6 +273,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -311,6 +320,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -324,6 +336,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -349,6 +364,9 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs
index 657cc25078c8c5db577db82d06e70777570673f5..09c3052fd6300f3efdf9fccfbb923929e9cbf9da 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs
@@ -93,6 +93,9 @@ namespace MonoTests.System.Drawing{
                }               
                
                [Test]
+#if TARGET_JVM
+               [Category ("NotWorking")]
+#endif
                public void TabsStops() 
                {                               
                        StringFormat    smf = new StringFormat ();

diff --git a/mcs/class/System.Drawing/Test/Test.dotnet.csproj b/mcs/class/System.Drawing/Test/Test.dotnet.csproj
index 8a69b3d581651ff225eacf645357e8066930f243..2647d19b8d77a80671bb0fdd3fa594b0281c1c10 100644 (file)
--- a/mcs/class/System.Drawing/Test/Test.dotnet.csproj
+++ b/mcs/class/System.Drawing/Test/Test.dotnet.csproj
@@ -36,7 +36,7 @@
                     NoStdLib = "false"\r
                     NoWarn = ""\r
                     Optimize = "false"\r
-                    OutputPath = "bin\Debug\"\r
+                    OutputPath = "DrawingTest\Test\"\r
                     RegisterForComInterop = "false"\r
                     RemoveIntegerChecks = "false"\r
                     TreatWarningsAsErrors = "false"\r
@@ -85,27 +85,24 @@
                     HintPath = "..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"\r
                 />\r
                 <Reference\r
-                    Name = "nunit.core"\r
-                    AssemblyName = "nunit.core"\r
-                    HintPath = "..\..\..\..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.core.dll"\r
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"\r
+                    Name = "DrawingTestHelper"\r
+                    Project = "{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}"\r
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"\r
                 />\r
                 <Reference\r
-                    Name = "nunit.framework"\r
-                    AssemblyName = "nunit.framework"\r
-                    HintPath = "..\..\..\..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.framework.dll"\r
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"\r
+                    Name = "nunit.core.dll.J2EE"\r
+                    Project = "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"\r
+                    Package = "{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"\r
                 />\r
                 <Reference\r
-                    Name = "nunit.util"\r
-                    AssemblyName = "nunit.util"\r
-                    HintPath = "..\..\..\..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.util.dll"\r
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"\r
+                    Name = "nunit.framework.dll.J2EE"\r
+                    Project = "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"\r
+                    Package = "{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"\r
                 />\r
                 <Reference\r
-                    Name = "DrawingTestHelper"\r
-                    Project = "{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}"\r
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"\r
+                    Name = "nunit.util.dll.J2EE"\r
+                    Project = "{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}"\r
+                    Package = "{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"\r
                 />\r
             </References>\r
         </Build>\r
@@ -113,6 +110,7 @@
             <Include>\r
                 <File\r
                     RelPath = "DrawingTest\Test\AssemblyInfo.cs"\r
+                    SubType = "Code"\r
                     BuildAction = "Compile"\r
                 />\r
                 <File\r

diff --git a/mcs/class/System.Drawing/Test/Test.vmwcsproj b/mcs/class/System.Drawing/Test/Test.vmwcsproj
index 4a51c4fdd7851d1ff5747ea374eb96b174635c58..a6acc143026755a15bfe296df19071572cefd934 100644 (file)
--- a/mcs/class/System.Drawing/Test/Test.vmwcsproj
+++ b/mcs/class/System.Drawing/Test/Test.vmwcsproj
@@ -2,20 +2,20 @@
        <CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{D92997D0-B8BD-49A8-A7D0-8B6043930A07}">\r
                <Build>\r
                        <Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="Test" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="Test" RunPostBuildEvent="OnBuildSuccess" StartupObject="">\r
-                               <Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>\r
+                               <Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="DrawingTest\Test\bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>\r
                                <Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>\r
                                <Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>\r
                        </Settings>\r
                        <References>\r
                                <Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>\r
-                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4\rt.dll" Private="False"/>\r
                                <Reference Name="DrawingTestHelper_java" Project="{8EF9FC71-4D70-4F89-BF4D-B83EF37D4A0C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
                                <Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll" Private="False"/>\r
                                <Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>\r
                                <Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>\r
-                               <Reference Name="nunit.core" AssemblyName="nunit.core" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\nunit.core.dll" Private="True"/>\r
-                               <Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\nunit.framework.dll" Private="True"/>\r
-                               <Reference Name="nunit.util" AssemblyName="nunit.util" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\nunit.util.dll" Private="True"/>\r
+                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>\r
+                               <Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
+                               <Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
+                               <Reference Name="nunit.util.dll.J2EE" Project="{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
                        </References>\r
                </Build>\r
                <Files>\r
@@ -65,6 +65,6 @@
                                <File RelPath="System.Drawing.Imaging\TestJpegCodec.cs" SubType="Code" BuildAction="Compile"/>\r
                        </Include>\r
                </Files>\r
-               <UserProperties jarserver="ipa" REFS.JarPath.system.drawing="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar" REFS.JarPath.system="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.rt="..\..\..\..\..\..\..\..\..\j2sdk1.4\lib\rt.jar" project.JDKType="1.4.2_05" REFS.JarPath.nunit.framework="..\..\..\..\..\..\..\..\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.jar" REFS.JarPath.nunit.core="..\..\..\..\..\..\..\..\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.jar" REFS.JarPath.nunit.util="..\..\..\..\..\..\..\..\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.jar"/>\r
+               <UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\..\..\..\j2sdk1.4\lib\rt.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.drawing="..\..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar"/>\r
        </CSHARP>\r
-       <VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit-console.jar" Prop2007="" Prop2008="" Prop2009="Test.jar /wait  /include:test1" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\Program Files\NUnit 2.2\bin\nunit-gui.exe" Prop2007="" Prop2008="" Prop2009="Test.dll" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>\r
+       <VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit-console.jar" Prop2007="" Prop2008="" Prop2009="Test.jar /wait  /include:test1" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\Program Files\NUnit 2.2\bin\nunit-gui.exe" Prop2007="" Prop2008="" Prop2009="Test.dll" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>\r