diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
new file mode 100644
index 0000000000..1566ba9366
--- /dev/null
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -0,0 +1,27 @@
+
+
+
+ net472
+ ..\bin\Content.IntegrationTests\
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.IntegrationTests/StartTest.cs b/Content.IntegrationTests/StartTest.cs
new file mode 100644
index 0000000000..8edc3b5437
--- /dev/null
+++ b/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
+ {
+ ///
+ /// Test that the server starts.
+ ///
+ [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();
+ Assert.That(runtimeLog.ExceptionCount, Is.EqualTo(0), "No exceptions must be logged.");
+ server.Stop();
+ await server.WaitIdleAsync();
+ Assert.That(!server.IsAlive);
+ }
+ }
+}
diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs
index 71494a3aef..1cf9aebed3 100644
--- a/Content.Shared/EntryPoint.cs
+++ b/Content.Shared/EntryPoint.cs
@@ -19,11 +19,6 @@ namespace Content.Shared
public override void Init()
{
IoCManager.InjectDependencies(this);
-
-#if DEBUG
- var resm = IoCManager.Resolve();
- resm.MountContentDirectory(@"../../../Resources/");
-#endif
}
public override void PostInit()
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
index 95c2b2715b..24a1eb115f 100644
--- a/Content.Tests/Content.Tests.csproj
+++ b/Content.Tests/Content.Tests.csproj
@@ -62,9 +62,9 @@
prompt
-
-
-
+
+
+
@@ -87,6 +87,26 @@
{26aeebb3-dde7-443a-9f43-7bc7f4acf6b5}
Content.Shared
+
+ {83429bd6-6358-4b18-be51-401df8ea2673}
+ Robust.Client
+
+
+ {b04aae71-0000-0000-0000-000000000000}
+ Robust.Server
+
+
+ {93f23a82-00c5-4572-964e-e7c9457726d4}
+ Robust.Shared.Maths
+
+
+ {0529f740-0000-0000-0000-000000000000}
+ Robust.Shared
+
+
+ {f0ada779-40b8-4f7e-ba6c-cdb19f3065d9}
+ Robust.UnitTesting
+