Merge branch 'master' of github.com:space-wizards/space-station-14

Content.IntegrationTests/Content.IntegrationTests.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net472</TargetFramework>
+        <OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="NUnit" Version="3.11.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
+      <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
+      <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
+      <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
+      <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
+      <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
+      <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
+      <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
+      <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
+    </ItemGroup>
+
+</Project>

Content.IntegrationTests/StartTest.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Robust.Shared.Exceptions;
+using Robust.Shared.Utility;
+using Robust.UnitTesting;
+
+namespace Content.IntegrationTests
+{
+    [TestFixture]
+    public class StartTest : RobustIntegrationTest
+    {
+        /// <summary>
+        ///     Test that the server starts.
+        /// </summary>
+        [Test]
+        public async Task TestServerStart()
+        {
+            var server = StartServer();
+            await server.WaitIdleAsync();
+            Assert.That(server.IsAlive);
+            server.RunTicks(5);
+            await server.WaitIdleAsync();
+            Assert.That(server.IsAlive);
+            var runtimeLog = server.ResolveDependency<IRuntimeLog>();
+            Assert.That(runtimeLog.ExceptionCount, Is.EqualTo(0), "No exceptions must be logged.");
+            server.Stop();
+            await server.WaitIdleAsync();
+            Assert.That(!server.IsAlive);
+        }
+    }
+}

Content.Shared/EntryPoint.cs

@@ -19,11 +19,6 @@ namespace Content.Shared
         public override void Init()
         {
             IoCManager.InjectDependencies(this);
-
-#if DEBUG
-            var resm = IoCManager.Resolve<IResourceManager>();
-            resm.MountContentDirectory(@"../../../Resources/");
-#endif
         }
 
         public override void PostInit()

Content.Tests/Content.Tests.csproj

@@ -62,9 +62,9 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
@@ -87,6 +87,26 @@
       <Project>{26aeebb3-dde7-443a-9f43-7bc7f4acf6b5}</Project>
       <Name>Content.Shared</Name>
     </ProjectReference>
+    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj">
+      <Project>{83429bd6-6358-4b18-be51-401df8ea2673}</Project>
+      <Name>Robust.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj">
+      <Project>{b04aae71-0000-0000-0000-000000000000}</Project>
+      <Name>Robust.Server</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj">
+      <Project>{93f23a82-00c5-4572-964e-e7c9457726d4}</Project>
+      <Name>Robust.Shared.Maths</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj">
+      <Project>{0529f740-0000-0000-0000-000000000000}</Project>
+      <Name>Robust.Shared</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj">
+      <Project>{f0ada779-40b8-4f7e-ba6c-cdb19f3065d9}</Project>
+      <Name>Robust.UnitTesting</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

SpaceStation14.sln

@@ -38,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.UnitTesting", "Robus
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared", "RobustToolbox\Robust.Shared\Robust.Shared.csproj", "{0529F740-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.IntegrationTests", "Content.IntegrationTests\Content.IntegrationTests.csproj", "{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -191,6 +193,18 @@ Global
 		{0529F740-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64
 		{0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
 		{0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x64.Build.0 = Debug|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|x86.Build.0 = Debug|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.ActiveCfg = Release|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x64.Build.0 = Release|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.ActiveCfg = Release|Any CPU
+		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE