Recover from before wrong revert

Assets/Editor/KinectAccessManagerTests.cs

@@ -46,20 +46,6 @@ public class KinectAccessManagerTests
         }
     }
 
-    [Test]
-    public void SourceFrame_NotEqual_Null_When_Access()
-    {
-        using (var obj = new KinectAccessManager())
-        {
-            obj.Access();
-
-            var expected = null as MultiSourceFrame;
-            var actual = obj.SourceFrame;
-
-            Assert.AreNotEqual(expected, actual, "SourceFrame should not be null value.");
-        }
-    }
-
     [Test]
     public void SourceFrame_Equal_Null_When_Dispose()
     {
@@ -72,21 +58,6 @@ public class KinectAccessManagerTests
         }
     }
 
-    [Test]
-    public void NullFrame_Equal_False_When_Access()
-    {
-        using (var obj = new KinectAccessManager())
-        {
-            obj.Access();
-            var tmp = obj.SourceFrame;
-
-            var expected = false;
-            var actual = obj.NullFrame;
-
-            Assert.AreEqual(expected, actual, "NullFrame should be false.");
-        }
-    }
-
     [Test]
     public void NullFrame_Equal_True_When_Dispose()
     {

Assets/Script/CoordinateMapperManager.cs

@@ -40,6 +40,7 @@ public class CoordinateMapperManager : MonoBehaviour
         _SourceBuffer = new KinectModule.SourceBuffer();
 
         _KinectAccessManager = new KinectModule.KinectAccessManager();
+        _KinectAccessManager.Dispose();
     }
 
     void OnEnable()
@@ -96,8 +97,8 @@ public class CoordinateMapperManager : MonoBehaviour
 	void Update()
 	{
         GetFPS();
-
-		var sourceFrame = new KinectModule.RealMultiSourceFrame(_KinectAccessManager.SourceFrame); ;
+        
+		var sourceFrame = new KinectModule.RealMultiSourceFrame(_KinectAccessManager.SourceFrame);
         
         if (!_KinectAccessManager.NullFrame)
         {
@@ -233,7 +234,7 @@ namespace KinectModule
                 FrameSourceTypes.BodyIndex |
                 FrameSourceTypes.Body);
 
-            _IsSensorOpen = (_SourceFrameReader != null);
+            _IsFrameReaderOpen = (_SourceFrameReader != null);
         }
 
         public void Dispose()
@@ -325,10 +326,14 @@ namespace KinectModule
 
         public RealMultiSourceFrame(MultiSourceFrame sourceFrame)
         {
-            _ColorFrame = new RealColorFrame(sourceFrame.ColorFrameReference.AcquireFrame());
-            _BodyIndexFrame = new RealBodyIndexFrame(sourceFrame.BodyIndexFrameReference.AcquireFrame());
-            _DepthFrame = new RealDepthFrame(sourceFrame.DepthFrameReference.AcquireFrame());
-            _BodyFrame = new RealBodyFrame(sourceFrame.BodyFrameReference.AcquireFrame());
+            _ColorFrame = new RealColorFrame(sourceFrame == null ? null :
+                sourceFrame.ColorFrameReference.AcquireFrame());
+            _BodyIndexFrame = new RealBodyIndexFrame(sourceFrame == null ? null :
+                sourceFrame.BodyIndexFrameReference.AcquireFrame());
+            _DepthFrame = new RealDepthFrame(sourceFrame == null ? null :
+                sourceFrame.DepthFrameReference.AcquireFrame());
+            _BodyFrame = new RealBodyFrame(sourceFrame == null ? null :
+                sourceFrame.BodyFrameReference.AcquireFrame());
         }
 
         private class RealColorFrame : IColorFrame

Assets/Script/Tests/CoordinateMapperManagerTests.cs

@@ -53,13 +53,15 @@ public class CoordinateMapperManagerTests
     public IEnumerator ColorTexture_Not_Equal_Null_When_Kinect_Connected()
     {
         var comp = ActiveComponent();
-
+        
         yield return null;
 
         var expected = null as Texture2D;
         var actual = comp.ColorTexture;
-
+        
         Assert.AreNotEqual(expected, actual, "ColorTexture should not be null value when kinect connected.");
+
+        Application.Quit();
     }
 
     [UnityTest]
@@ -150,9 +152,9 @@ public class CoordinateMapperManagerTests
     CoordinateMapperManager InactiveComponent()
     {
         var tmpObj = new GameObject();
-        var comp = tmpObj.GetComponent<CoordinateMapperManager>();
+        var comp = tmpObj.AddComponent<CoordinateMapperManager>();
         tmpObj.SetActive(false);
 
         return comp;
     }
-}
+}
\ No newline at end of file

Assets/Script/Tests/CoordinateMapperViewTests.cs

@@ -9,42 +9,47 @@ class CoordinateMapperViewTests
     [UnityTest]
     public IEnumerator MainTexture_Equal_Texture_Generate_By_Shader_When_After_Update()
     {
-        yield return null;
+        var tmpObj = CreatePlaneWithShader();
 
-        GameManager.Instance.SceneTransition("InGame");
+        var manager = CreateManager();
 
-        yield return null;
+        var material = tmpObj.GetComponent<Renderer>().material;
+        material.SetTexture("_MainTex", manager.ColorTexture);
 
-        var tmpObj = GameObject.CreatePrimitive(PrimitiveType.Plane);
-        tmpObj.GetComponent<Renderer>().material = Resources.Load("GreenScreen/GreenScreen.mat", typeof(Material)) as Material;
+        var DepthPoints = manager.DepthCoordinates;
+        var DepthBuffer = new ComputeBuffer(DepthPoints.Length, sizeof(float) * 2);
+        material.SetBuffer("depthCoordinates", DepthBuffer);
 
-        var material = tmpObj.GetComponent<Renderer>().material;
-        SetTextureBuffer(material);
+        var BodyIndexPoints = manager.BodyIndexBuffer;
+        var BodyIndexBuffer = new ComputeBuffer(BodyIndexPoints.Length, sizeof(float));
+        material.SetBuffer("bodyIndexBuffer", BodyIndexBuffer);
 
-        var CoordinateMapperView = GameObject.Find("CoordinateMapView");
+        var coordinateMapperView = CreatePlaneWithShader();
+        var CoordinateMapperView = coordinateMapperView.AddComponent<CoordinateMapperView>();
 
         yield return null;
 
-        var expected = new Texture();
-        Graphics.CopyTexture(material.mainTexture, expected);
+        var expected = material.mainTexture;
         Object.Destroy(tmpObj);
+        DepthBuffer.Release();
+        BodyIndexBuffer.Release();
 
         var actual = CoordinateMapperView.GetComponent<Renderer>().material.mainTexture;
 
         Assert.AreEqual(expected, actual, "texture of gameobject should be same as texture which made by shader.");
     }
 
-    void SetTextureBuffer(Material material)
+    CoordinateMapperManager CreateManager()
     {
-        var CoordinateMapperManager = GameObject.Find("Managers").GetComponent<CoordinateMapperManager>();
-        material.SetTexture("_MainTex", CoordinateMapperManager.ColorTexture);
+        var manager = new GameObject("Managers");
+        return manager.AddComponent<CoordinateMapperManager>();
+    }
 
-        var DepthPoints = CoordinateMapperManager.DepthCoordinates;
-        var DepthBuffer = new ComputeBuffer(DepthPoints.Length, sizeof(float) * 2);
-        material.SetBuffer("depthCoordinates", DepthBuffer);
+    GameObject CreatePlaneWithShader()
+    {
+        var tmpObj = GameObject.CreatePrimitive(PrimitiveType.Plane);
+        tmpObj.GetComponent<Renderer>().material = Resources.Load("GreenScreen/GreenScreen.mat", typeof(Material)) as Material;
 
-        var BodyIndexPoints = CoordinateMapperManager.BodyIndexBuffer;
-        var BodyIndexBuffer = new ComputeBuffer(BodyIndexPoints.Length, sizeof(float));
-        material.SetBuffer("bodyIndexBuffer", BodyIndexBuffer);
+        return tmpObj;
     }
 }