DanielWagnerHall: Making C# UnitTests fit in better with the C# proje…

…ct structure r13283
nimeacuerdo · Aug 8, 2011 · 013bbdc · 013bbdc
1 parent 2b7ed81
commit 013bbdc
Show file tree

Hide file tree

Showing 7 changed files with 2,739 additions and 2,720 deletions.
diff --git a/Rakefile b/Rakefile
@@ -208,6 +208,7 @@ task :test_py => [
 ]
 
 task :test_dotnet => [
+  "//dotnet/test:unit:run",
   "//dotnet/test:firefox:run"
 ]
 

diff --git a/WebDriver.sln b/WebDriver.sln
@@ -66,7 +66,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver", "dotnet\src\Web
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "cpp\webdriver-server\webdriver-server.vcxproj", "{35A23A16-EF17-4CC3-8854-785025A304F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Remote.UnitTests", "dotnet\test\WebDriver.Remote.UnitTests\WebDriver.Remote.UnitTests.csproj", "{D9387770-DA92-4898-801F-F61255739D38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.UnitTests", "dotnet\test\WebDriver.UnitTests\WebDriver.UnitTests.csproj", "{D9387770-DA92-4898-801F-F61255739D38}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/cpp/IEDriver/Generated/atoms.h b/cpp/IEDriver/Generated/atoms.h
diff --git a/...ote.UnitTests/DesiredCapabilitiesTests.cs → ...ver.UnitTests/DesiredCapabilitiesTests.cs b/...ote.UnitTests/DesiredCapabilitiesTests.cs → ...ver.UnitTests/DesiredCapabilitiesTests.cs
diff --git a/...mote.UnitTests/Properties/AssemblyInfo.cs → ...iver.UnitTests/Properties/AssemblyInfo.cs b/...mote.UnitTests/Properties/AssemblyInfo.cs → ...iver.UnitTests/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Selenium WebDriver Remote Unit tests")]
-[assembly: AssemblyDescription("Selenium WebDriver Remote Unit tests")]
+[assembly: AssemblyDescription("Selenium WebDriver Unit tests")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Selenium Committers")]
 [assembly: AssemblyProduct("Selenium")]

diff --git a/...itTests/WebDriver.Remote.UnitTests.csproj → ...iver.UnitTests/WebDriver.UnitTests.csproj b/...itTests/WebDriver.Remote.UnitTests.csproj → ...iver.UnitTests/WebDriver.UnitTests.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{D9387770-DA92-4898-801F-F61255739D38}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WebDriver.Remote.UnitTests</RootNamespace>
-    <AssemblyName>WebDriver.Remote.UnitTests</AssemblyName>
+    <RootNamespace>OpenQA.Selenium</RootNamespace>
+    <AssemblyName>WebDriver.UnitTests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

diff --git a/dotnet/test/build.desc b/dotnet/test/build.desc
@@ -120,6 +120,24 @@ dotnet_test(name = "android",
   ],
   project = "WebDriver.Android.Tests.nunit"
 )
+
+dotnet_test(name = "unit",
+  srcs = "WebDriver.UnitTests/**/*.cs",
+  refs = [
+    "System.dll",
+    "System.Core.dll",
+    "System.Data.dll",
+    "System.Drawing.dll",
+    "System.Xml.dll",
+    "//dotnet:dotnet",
+    ":common",
+    "third_party/csharp/nunit-2.5.9/lib/nunit.core.dll",
+    "third_party/csharp/nunit-2.5.9/lib/nunit.core.interfaces.dll",
+    "third_party/csharp/nunit-2.5.9/framework/nunit.framework.dll",
+  ],
+  out = "build/dotnet/WebDriver.UnitTests.dll",
+  project = "WebDriver.UnitTests.dll"
+)
 
 dotnet_test(name = "support",
   srcs = "WebDriver.Support.Tests/**/*.cs",