Reenabled file excluded from build.

rold2007 · Aug 10, 2017 · 4bfdc14 · 4bfdc14
1 parent 657c571
commit 4bfdc14
Show file tree

Hide file tree

Showing 15 changed files with 1,007 additions and 1,074 deletions.
diff --git a/ImagingInterface.v3.ncrunchsolution b/ImagingInterface.v3.ncrunchsolution
@@ -3,30 +3,14 @@
     <AllowParallelTestExecution>False</AllowParallelTestExecution>
     <MetricsExclusionList>
       <Value>CaptureWrapper.cs:Plugins\Video\Controllers\Video.Controllers.csproj</Value>
-      <Value>Core\Tests\ImagingInterface.Controllers.Tests\ImagingInterface.Controllers.Tests.csproj</Value>
-      <Value>Core\Tests\ImagingInterface.Tests.Common\ImagingInterface.Tests.Common.csproj</Value>
       <Value>ImagingInterface.Controllers.Tests\ImagingInterface.Controllers.Tests.csproj</Value>
       <Value>ImagingInterface.Views\ImagingInterface.Views.csproj</Value>
       <Value>ImagingInterface\ImagingInterface.csproj\Properties</Value>
       <Value>Plugins\ImageProcessing\Bootstrapper\ImageProcessing.Bootstrapper.csproj</Value>
-      <Value>Plugins\ImageProcessing\Tests\ImageProcessing.Controllers.Tests\ImageProcessing.Controllers.Tests.csproj</Value>
       <Value>Plugins\Video\Bootstrapper\Video.Bootstrapper.csproj</Value>
-      <Value>Plugins\Video\Tests\Video.Controllers.Tests\Video.Controllers.Tests.csproj</Value>
       <Value>Core\ImagingInterface\ImagingInterface.csproj</Value>
-      <Value>Plugins\Video\Controllers\Video.Controllers.csproj</Value>
-      <Value>Plugins\Video\Controllers.Interfaces\Video.Controllers.Interfaces.csproj</Value>
-      <Value>Plugins\Video\Models\Video.Models.csproj</Value>
-      <Value>Plugins\Video\Models.Interfaces\Video.Models.Interfaces.csproj</Value>
       <Value>Plugins\Video\Views\Video.Views.csproj</Value>
       <Value>Plugins\Video\Views.Interfaces\Video.Views.Interfaces.csproj</Value>
-      <Value>Plugins\ImageProcessing\Controllers\ImageProcessing.Controllers.csproj</Value>
-      <Value>Plugins\ImageProcessing\Controllers.Interfaces\ImageProcessing.Controllers.Interfaces.csproj</Value>
-      <Value>Plugins\ImageProcessing\Cudafied\ImageProcessing.Cudafied.csproj</Value>
-      <Value>Plugins\ImageProcessing\Models\ImageProcessing.Models.csproj</Value>
-      <Value>Plugins\ImageProcessing\Models.Interfaces\ImageProcessing.Models.Interfaces.csproj</Value>
-      <Value>Plugins\ImageProcessing\ObjectDetection\ImageProcessing.ObjectDetection.csproj</Value>
-      <Value>Plugins\ImageProcessing\ObjectDetection.Interfaces\ImageProcessing.ObjectDetection.Interfaces.csproj</Value>
-      <Value>Plugins\ImageProcessing\Tests\ImageProcessing.ObjectDetection.Tests\ImageProcessing.ObjectDetection.Tests.csproj</Value>
       <Value>Plugins\ImageProcessing\Views\ImageProcessing.Views.csproj</Value>
       <Value>Plugins\ImageProcessing\Views.Interfaces\ImageProcessing.Views.Interfaces.csproj</Value>
       <Value>Core\ImagingInterface.Views\ImagingInterface.Views.csproj</Value>

diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ControllersBaseTest.cs b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ControllersBaseTest.cs
@@ -1,37 +1,36 @@
-namespace ImageProcessing.Controllers.Tests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using ImageProcessing.Controllers;
-    using ImageProcessing.Models;
-    using ImageProcessing.ObjectDetection;
-    using ImagingInterface.Controllers;
-    using ImagingInterface.Models;
-    using ImagingInterface.Plugins;
-    using ImagingInterface.Tests.Common;
-    using ImagingInterface.Tests.Common.Mocks;
-    using NUnit.Framework;
+// <copyright file="ControllersBaseTest.cs" company="David Rolland">
+// Copyright (c) David Rolland. All rights reserved.
+// </copyright>
 
-    public abstract class ControllersBaseTest : BaseTest
-    {
-        public Container Container
-        {
-            get;
-            private set;
-        }
+namespace ImageProcessing.Controllers.Tests
+{
+   using System;
+   using System.Collections.Generic;
+   using System.Linq;
+   using System.Text;
+   using System.Threading;
+   using System.Threading.Tasks;
+   using ImageProcessing.Controllers;
+   using ImageProcessing.Models;
+   using ImageProcessing.ObjectDetection;
+   using ImagingInterface.Controllers;
+   using ImagingInterface.Models;
+   using ImagingInterface.Plugins;
+   using ImagingInterface.Tests.Common;
+   using ImagingInterface.Tests.Common.Mocks;
+   using NUnit.Framework;
 
-        [SetUp]
-        protected override void SetUp()
-        {
-            base.SetUp();
+   public abstract class ControllersBaseTest : BaseTest
+   {
+      [SetUp]
+      protected override void SetUp()
+      {
+         base.SetUp();
 
-            this.Bootstrap();
-        }
+         ////this.Bootstrap();
+      }
 
+      /*
         protected void Bootstrap()
         {
             this.Container = new Container();
@@ -81,6 +80,6 @@ protected void Bootstrap()
             // Processing
             this.Container.RegisterSingleton<IObjectDetector, ObjectDetector>();
             this.Container.RegisterSingleton<ITagger, Tagger>();
-        }
-    }
+        }*/
+   }
 }