Commit 51779acb authored by 16이상민's avatar 16이상민

Modify tests and target classes Appropriately

parent ecd89d5d
...@@ -46,20 +46,6 @@ public class KinectAccessManagerTests ...@@ -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] [Test]
public void SourceFrame_Equal_Null_When_Dispose() public void SourceFrame_Equal_Null_When_Dispose()
{ {
...@@ -72,21 +58,6 @@ public class KinectAccessManagerTests ...@@ -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] [Test]
public void NullFrame_Equal_True_When_Dispose() public void NullFrame_Equal_True_When_Dispose()
{ {
......
...@@ -40,6 +40,7 @@ public class CoordinateMapperManager : MonoBehaviour ...@@ -40,6 +40,7 @@ public class CoordinateMapperManager : MonoBehaviour
_SourceBuffer = new KinectModule.SourceBuffer(); _SourceBuffer = new KinectModule.SourceBuffer();
_KinectAccessManager = new KinectModule.KinectAccessManager(); _KinectAccessManager = new KinectModule.KinectAccessManager();
_KinectAccessManager.Dispose();
} }
void OnEnable() void OnEnable()
...@@ -96,8 +97,8 @@ public class CoordinateMapperManager : MonoBehaviour ...@@ -96,8 +97,8 @@ public class CoordinateMapperManager : MonoBehaviour
void Update() void Update()
{ {
GetFPS(); GetFPS();
var sourceFrame = new KinectModule.RealMultiSourceFrame(_KinectAccessManager.SourceFrame); ; var sourceFrame = new KinectModule.RealMultiSourceFrame(_KinectAccessManager.SourceFrame);
if (!_KinectAccessManager.NullFrame) if (!_KinectAccessManager.NullFrame)
{ {
...@@ -233,7 +234,7 @@ namespace KinectModule ...@@ -233,7 +234,7 @@ namespace KinectModule
FrameSourceTypes.BodyIndex | FrameSourceTypes.BodyIndex |
FrameSourceTypes.Body); FrameSourceTypes.Body);
_IsSensorOpen = (_SourceFrameReader != null); _IsFrameReaderOpen = (_SourceFrameReader != null);
} }
public void Dispose() public void Dispose()
...@@ -325,10 +326,14 @@ namespace KinectModule ...@@ -325,10 +326,14 @@ namespace KinectModule
public RealMultiSourceFrame(MultiSourceFrame sourceFrame) public RealMultiSourceFrame(MultiSourceFrame sourceFrame)
{ {
_ColorFrame = new RealColorFrame(sourceFrame.ColorFrameReference.AcquireFrame()); _ColorFrame = new RealColorFrame(sourceFrame == null ? null :
_BodyIndexFrame = new RealBodyIndexFrame(sourceFrame.BodyIndexFrameReference.AcquireFrame()); sourceFrame.ColorFrameReference.AcquireFrame());
_DepthFrame = new RealDepthFrame(sourceFrame.DepthFrameReference.AcquireFrame()); _BodyIndexFrame = new RealBodyIndexFrame(sourceFrame == null ? null :
_BodyFrame = new RealBodyFrame(sourceFrame.BodyFrameReference.AcquireFrame()); 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 private class RealColorFrame : IColorFrame
......
...@@ -53,13 +53,15 @@ public class CoordinateMapperManagerTests ...@@ -53,13 +53,15 @@ public class CoordinateMapperManagerTests
public IEnumerator ColorTexture_Not_Equal_Null_When_Kinect_Connected() public IEnumerator ColorTexture_Not_Equal_Null_When_Kinect_Connected()
{ {
var comp = ActiveComponent(); var comp = ActiveComponent();
yield return null; yield return null;
var expected = null as Texture2D; var expected = null as Texture2D;
var actual = comp.ColorTexture; var actual = comp.ColorTexture;
Assert.AreNotEqual(expected, actual, "ColorTexture should not be null value when kinect connected."); Assert.AreNotEqual(expected, actual, "ColorTexture should not be null value when kinect connected.");
Application.Quit();
} }
[UnityTest] [UnityTest]
...@@ -150,9 +152,9 @@ public class CoordinateMapperManagerTests ...@@ -150,9 +152,9 @@ public class CoordinateMapperManagerTests
CoordinateMapperManager InactiveComponent() CoordinateMapperManager InactiveComponent()
{ {
var tmpObj = new GameObject(); var tmpObj = new GameObject();
var comp = tmpObj.GetComponent<CoordinateMapperManager>(); var comp = tmpObj.AddComponent<CoordinateMapperManager>();
tmpObj.SetActive(false); tmpObj.SetActive(false);
return comp; return comp;
} }
} }
\ No newline at end of file
...@@ -9,42 +9,47 @@ class CoordinateMapperViewTests ...@@ -9,42 +9,47 @@ class CoordinateMapperViewTests
[UnityTest] [UnityTest]
public IEnumerator MainTexture_Equal_Texture_Generate_By_Shader_When_After_Update() 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); var DepthPoints = manager.DepthCoordinates;
tmpObj.GetComponent<Renderer>().material = Resources.Load("GreenScreen/GreenScreen.mat", typeof(Material)) as Material; var DepthBuffer = new ComputeBuffer(DepthPoints.Length, sizeof(float) * 2);
material.SetBuffer("depthCoordinates", DepthBuffer);
var material = tmpObj.GetComponent<Renderer>().material; var BodyIndexPoints = manager.BodyIndexBuffer;
SetTextureBuffer(material); 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; yield return null;
var expected = new Texture(); var expected = material.mainTexture;
Graphics.CopyTexture(material.mainTexture, expected);
Object.Destroy(tmpObj); Object.Destroy(tmpObj);
DepthBuffer.Release();
BodyIndexBuffer.Release();
var actual = CoordinateMapperView.GetComponent<Renderer>().material.mainTexture; var actual = CoordinateMapperView.GetComponent<Renderer>().material.mainTexture;
Assert.AreEqual(expected, actual, "texture of gameobject should be same as texture which made by shader."); 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>(); var manager = new GameObject("Managers");
material.SetTexture("_MainTex", CoordinateMapperManager.ColorTexture); return manager.AddComponent<CoordinateMapperManager>();
}
var DepthPoints = CoordinateMapperManager.DepthCoordinates; GameObject CreatePlaneWithShader()
var DepthBuffer = new ComputeBuffer(DepthPoints.Length, sizeof(float) * 2); {
material.SetBuffer("depthCoordinates", DepthBuffer); var tmpObj = GameObject.CreatePrimitive(PrimitiveType.Plane);
tmpObj.GetComponent<Renderer>().material = Resources.Load("GreenScreen/GreenScreen.mat", typeof(Material)) as Material;
var BodyIndexPoints = CoordinateMapperManager.BodyIndexBuffer; return tmpObj;
var BodyIndexBuffer = new ComputeBuffer(BodyIndexPoints.Length, sizeof(float));
material.SetBuffer("bodyIndexBuffer", BodyIndexBuffer);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment