Permalink
Browse files

NUnit to 3 series from NuGet

  • Loading branch information...
kf6kjg committed Dec 26, 2018
1 parent ecec9eb commit 27fc92fcfff251fe3efef12c7c88e6a8fa1ab013
Showing with 1,425 additions and 1,243 deletions.
  1. +3 −2 .gitignore
  2. +14 −4 Halcyon/Halcyon.Data.Inventory.MySQL/Halcyon.Data.Inventory.MySQL.csproj
  3. +4 −0 Halcyon/Halcyon.Data.Inventory.MySQL/packages.config
  4. +15 −5 InWorldz/InWorldz.Data.Assets.Stratus/InWorldz.Data.Assets.Stratus.csproj
  5. +1 −1 InWorldz/InWorldz.Data.Assets.Stratus/Tests/AssetCacheTests.cs
  6. +1 −1 InWorldz/InWorldz.Data.Assets.Stratus/Tests/AssetClassTests.cs
  7. +2 −2 InWorldz/InWorldz.Data.Assets.Stratus/Tests/CloudFilesTest.cs
  8. +2 −2 InWorldz/InWorldz.Data.Assets.Stratus/Tests/DiskWriteBackCacheTests.cs
  9. +19 −0 InWorldz/InWorldz.Data.Assets.Stratus/Tests/TestSetup.cs
  10. +4 −0 InWorldz/InWorldz.Data.Assets.Stratus/packages.config
  11. +14 −5 InWorldz/InWorldz.Phlox.Engine/InWorldz.Phlox.Engine.csproj
  12. +2 −2 InWorldz/InWorldz.Phlox.Engine/Tests/JsonTests.cs
  13. +2 −2 InWorldz/InWorldz.Phlox.Engine/Tests/MaterialsTests.cs
  14. +4 −0 InWorldz/InWorldz.Phlox.Engine/packages.config
  15. +412 −399 InWorldz/InWorldz.PhysxPhysics/InWorldz.PhysxPhysics.csproj
  16. +4 −0 InWorldz/InWorldz.PhysxPhysics/packages.config
  17. +14 −10 InWorldz/InWorldz.Region.Data.Thoosa/InWorldz.Region.Data.Thoosa.csproj
  18. +1 −1 InWorldz/InWorldz.Region.Data.Thoosa/Tests/InvSerializerTests.cs
  19. +1 −1 InWorldz/InWorldz.Region.Data.Thoosa/Tests/SerializerTests.cs
  20. +4 −0 InWorldz/InWorldz.Region.Data.Thoosa/packages.config
  21. +213 −201 InWorldz/InWorldz.VivoxVoice/InWorldz.VivoxVoice.csproj
  22. +4 −0 InWorldz/InWorldz.VivoxVoice/packages.config
  23. +217 −204 MOSES/FreeswitchVoice/MOSES.FreeSwitchVoice.csproj
  24. +4 −0 MOSES/FreeswitchVoice/packages.config
  25. +1 −1 OpenSim/Framework/Tests/ByteBufferPoolTests.cs
  26. +1 −1 OpenSim/Framework/Tests/LRUCacheTests.cs
  27. +14 −5 OpenSim/Framework/Tests/OpenSim.Framework.Tests.csproj
  28. +1 −1 OpenSim/Framework/Tests/RenderMaterialsTests.cs
  29. +4 −0 OpenSim/Framework/Tests/packages.config
  30. +14 −5 OpenSim/Region/FrameworkTests/OpenSim.Region.FrameworkTests.csproj
  31. +0 −5 OpenSim/Region/FrameworkTests/Serialization.cs
  32. +4 −0 OpenSim/Region/FrameworkTests/packages.config
  33. +207 −190 .../Region/Physics/ConvexDecompositionDotNet/OpenSim.Region.Physics.ConvexDecompositionDotNet.csproj
  34. +4 −0 OpenSim/Region/Physics/ConvexDecompositionDotNet/packages.config
  35. +210 −193 OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
  36. +4 −0 OpenSim/Region/Physics/Manager/packages.config
  37. BIN lib/nunit.framework.dll
@@ -200,8 +200,9 @@ FakesAssemblies/
# Visual Studio 6 workspace options file
*.opt

# Produced by runprebuild.bat (prbably not used by anyone since it's an absolute hard-coded path)
compile.bat
# Unit testing
nunit.framework.*
bin/cache/*/*.asset

# Bin stuff that we don't want to commit that gets created when you run the server
*.nxs
@@ -1,4 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="..\..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" />
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>14.0.23107.0</ProductVersion>
@@ -25,6 +26,8 @@
</StartArguments>
<FileUpgradeFlags>
</FileUpgradeFlags>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -101,10 +104,8 @@
<HintPath>..\..\bin\Nini.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework">
<Name>nunit.framework</Name>
<HintPath>..\..\bin\nunit.framework.dll</HintPath>
<Private>False</Private>
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="SmartThreadPool">
<Name>SmartThreadPool</Name>
@@ -199,11 +200,20 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.11.0\build\NUnit.props'))" />
</Target>
</Project>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.11.0" targetFramework="net471" />
</packages>
@@ -1,4 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="..\..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" />
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>14.0.23107.0</ProductVersion>
@@ -13,7 +14,6 @@
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>

<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<OutputPath>../../bin/</OutputPath>
<OutputType>Library</OutputType>
@@ -26,6 +26,8 @@
</StartArguments>
<FileUpgradeFlags>
</FileUpgradeFlags>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -102,10 +104,8 @@
<HintPath>..\..\bin\Nini.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework">
<Name>nunit.framework</Name>
<HintPath>..\..\bin\nunit.framework.dll</HintPath>
<Private>False</Private>
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="openstacknet">
<Name>openstacknet</Name>
@@ -213,6 +213,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Tests\TestSetup.cs" />
<EmbeddedResource Include="Resources\InWorldz.Data.Assets.Stratus.addin.xml">
</EmbeddedResource>
<Compile Include="CloudFilesAssetClient.cs">
@@ -267,11 +268,20 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.11.0\build\NUnit.props'))" />
</Target>
</Project>
@@ -40,7 +40,7 @@ namespace InWorldz.Data.Assets.Stratus.Tests
[TestFixture]
class AssetCacheTests
{
[TestFixtureSetUp]
[SetUp]
public void Setup()
{
Config.Settings.Instance.CFCacheSize = Config.Constants.MAX_CACHEABLE_ASSET_SIZE * 10;
@@ -43,7 +43,7 @@ namespace InWorldz.Data.Assets.Stratus.Tests
[TestFixture]
class AssetClassTests
{
[TestFixtureSetUp]
[SetUp]
public void Setup()
{
}
@@ -47,7 +47,7 @@ class CloudFilesTest
private CloudFilesAssetClient _client;
private bool _runTests;

[TestFixtureSetUp]
[SetUp]
public void Setup()
{
if (Environment.GetEnvironmentVariable("CFUsername") == null)
@@ -70,7 +70,7 @@ public void Setup()
_client.Start();
}

[TestFixtureTearDown]
[TearDown]
public void Stop()
{
if (!_runTests) return;
@@ -47,7 +47,7 @@ class DiskWriteBackCacheTests
private CloudFilesAssetClient _client;
private bool _runTests;

[TestFixtureSetUp]
[SetUp]
public void Setup()
{
if (Environment.GetEnvironmentVariable("CFUsername") == null)
@@ -70,7 +70,7 @@ public void Setup()
_client.Start();
}

[TestFixtureTearDown]
[TearDown]
public void Stop()
{
if (!_runTests) return;
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NUnit.Framework;

namespace InWorldz.Data.Assets.Stratus.Tests
{
[SetUpFixture]
class TestSetup
{
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
System.IO.Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
}
}
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.11.0" targetFramework="net471" />
</packages>
@@ -1,4 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="..\..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" />
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>14.0.23107.0</ProductVersion>
@@ -13,7 +14,6 @@
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>

<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<OutputPath>../../bin/</OutputPath>
<OutputType>Library</OutputType>
@@ -26,6 +26,8 @@
</StartArguments>
<FileUpgradeFlags>
</FileUpgradeFlags>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -112,10 +114,8 @@
<HintPath>..\..\bin\Nini.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework">
<Name>nunit.framework</Name>
<HintPath>..\..\bin\nunit.framework.dll</HintPath>
<Private>False</Private>
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="protobuf-net">
<Name>protobuf-net</Name>
@@ -320,11 +320,20 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.11.0\build\NUnit.props'))" />
</Target>
</Project>
@@ -17,7 +17,7 @@ public class JsonTests
LSLSystemAPI lslSystemApi;
Scene world;

[TestFixtureSetUp]
[SetUp]
public void Setup()
{
var iniDoc = new IniDocument();
@@ -28,7 +28,7 @@ public void Setup()
lslSystemApi = new LSLSystemAPI(engine, null, 0, UUID.Zero);
}

[TestFixtureTearDown]
[TearDown]
public void Teardown()
{
SceneHelper.TearDownScene(world);
@@ -18,7 +18,7 @@ public class MaterialsTests
Scene world;
MockScriptEngine engine;

[TestFixtureSetUp]
[SetUp]
public void Setup()
{
var iniDoc = new IniDocument();
@@ -28,7 +28,7 @@ public void Setup()
engine = new MockScriptEngine(world, configSource);
}

[TestFixtureTearDown]
[TearDown]
public void Teardown()
{
SceneHelper.TearDownScene(world);
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.11.0" targetFramework="net471" />
</packages>
Oops, something went wrong.

0 comments on commit 27fc92f

Please sign in to comment.