Write Tests for class "MotionNoteMaker"

Assets/Editor/ButtonNoteMakerTests.cs

@@ -64,7 +64,8 @@ class ButtonNoteMakerTests
         var note2 = obj.Make("AA", "LBT", 2);
 
         var expected = true;
-        var actual = (note1.Type == NoteType.SBT &&
+        var actual = (tmp        == null         &&
+                      note1.Type == NoteType.SBT &&
                       note2.Type == NoteType.LBT);
 
         Assert.AreEqual(expected, actual, "The short next long note should be made correctly");
@@ -79,7 +80,8 @@ class ButtonNoteMakerTests
         var note2 = obj.Make("AA", "SBT", 2);
 
         var expected = true;
-        var actual = (note1.Type == NoteType.LBT &&
+        var actual = (tmp        == null         && 
+                      note1.Type == NoteType.LBT &&
                       note2.Type == NoteType.SBT);
 
         Assert.AreEqual(expected, actual, "The long next short note should be made correctly");

Assets/Editor/DistItvExtractorTests.cs

@@ -10,8 +10,8 @@ public class DistItvExtractorTests
     {
         var obj = new DistItvExtractor(0.0f);
 
-        var expected = null as float?;
-        var actual = obj.DistHandBaseSpineShoulder;
+        var expected = true;
+        var actual = (obj.DistHandBaseSpineShoulder == null);
 
         Assert.AreEqual(expected, actual, "DistHandBaseSpineShoulder should be null value when constructed");
     }

Assets/Editor/MotionNoteMakerTests.cs

+using TrackAnalysis;
+using NUnit.Framework;
+
+class MotionNoteMakerTests
+{
+    [Test]
+    public void Made_Note_Should_Null_When_Invalid_Note_Type()
+    {
+        var obj = new MotionNoteMaker();
+        var note = obj.Make("CP", "SBT", 0);
+
+        var expected = true;
+        var actual = (note == null);
+
+        Assert.AreEqual(expected, actual, "Made note should be null value when invalid note type");
+    }
+
+    [Test]
+    public void Made_Note_Should_Null_When_Invalid_Code()
+    {
+        var obj = new MotionNoteMaker();
+        var note = obj.Make("AA", "SMO", 0);
+
+        var expected = true;
+        var actual = (note == null);
+
+        Assert.AreEqual(expected, actual, "Made note should be null value when invalid code");
+    }
+
+    [Test]
+    public void Made_Note_Should_Short_When_Note_Type_SMO_Code_CP()
+    {
+        var obj = new MotionNoteMaker();
+        var note = obj.Make("CP", "SMO", 0);
+
+        var expected = true;
+        var actual = (note.Type == NoteType.SMO);
+
+        Assert.AreEqual(expected, actual, "Made note should be short when note type is SMO and code is CP");
+    }
+
+    [Test]
+    public void Made_Note_Should_Long_When_Note_Type_LMO_Code_CP()
+    {
+        var obj = new MotionNoteMaker();
+        var tmp  = obj.Make("CP", "LMO", 0);
+        var note = obj.Make("CP", "LMO", 1);
+
+        var expected = true;
+        var actual = (tmp == null &&
+                      note.Type == NoteType.LMO);
+
+        Assert.AreEqual(expected, actual, "Made note should be long when note type is LMO and code is CP");
+    }
+
+    [Test]
+    public void Short_Short_Should_Made_Correctly_When_Code_CP()
+    {
+        var obj = new MotionNoteMaker();
+        var note1 = obj.Make("CP", "SMO", 0);
+        var note2 = obj.Make("CP", "SMO", 1);
+
+        var expected = true;
+        var actual = (note1.Type == NoteType.SMO &&
+                      note2.Type == NoteType.SMO);
+
+        Assert.AreEqual(expected, actual, "2 short notes should be made correctly when code is cp");
+    }
+
+    [Test]
+    public void Short_Long_Should_Made_Correctly_When_Code_CP()
+    {
+        var obj = new MotionNoteMaker();
+        var note1 = obj.Make("CP", "SMO", 0);
+        var tmp   = obj.Make("CP", "LMO", 1);
+        var note2 = obj.Make("CP", "LMO", 2);
+
+        var expected = true;
+        var actual = (tmp        == null         &&
+                      note1.Type == NoteType.SMO &&
+                      note2.Type == NoteType.LMO);
+
+        Assert.AreEqual(expected, actual, "The short next long note should be made correctly when code is cp");
+    }
+
+    [Test]
+    public void Long_Short_Should_Made_Correctly_When_Code_CP()
+    {
+        var obj = new MotionNoteMaker();
+        var tmp   = obj.Make("CP", "LMO", 0);
+        var note1 = obj.Make("CP", "LMO", 1);
+        var note2 = obj.Make("CP", "SMO", 2);
+
+        var expected = true;
+        var actual = (tmp        == null         &&
+                      note1.Type == NoteType.LMO &&
+                      note2.Type == NoteType.SMO);
+
+        Assert.AreEqual(expected, actual, "The long next short note should be made correctly when code is cp");
+    }
+
+    [Test]
+    public void Long_Long_Should_Made_Correctly_When_Code_CP()
+    {
+        var obj = new MotionNoteMaker();
+        var tmp1  = obj.Make("CP", "LMO", 0);
+        var note1 = obj.Make("CP", "LMO", 1);
+        var tmp2  = obj.Make("CP", "LMO", 2);
+        var note2 = obj.Make("CP", "LMO", 3);
+
+        var expected = true;
+        var actual = (tmp1 == null &&
+                      tmp2 == null &&
+                      note1.Type == NoteType.LMO &&
+                      note2.Type == NoteType.LMO);
+
+        Assert.AreEqual(expected, actual, "2 long notes should be made correctly when code is cp");
+    }
+}
\ No newline at end of file

Assets/Editor/MotionNoteMakerTests.cs.meta

+fileFormatVersion: 2
+guid: 9b0d8272d7d2f2c4d9c885ad3e7e310c
+timeCreated: 1518217518
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MotionNotes/Clap.cs

@@ -11,11 +11,9 @@ public class Clap : MotionNote
         }
     }
 
-    public Clap(string key, float start, float end = 0f) : this(start, end)
+    public Clap(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         MotionName = "Clap";
     }
-    public Clap(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/Guard.cs

@@ -11,7 +11,8 @@ public class Guard : MotionNote
         }
     }
 
-    public Guard(string key, float start, float end = 0f) : this(start, end)
+    public Guard(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         switch (key)
         {
@@ -29,7 +30,4 @@ public class Guard : MotionNote
                 break;
         }
     }
-    public Guard(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/HandDown.cs

@@ -11,7 +11,8 @@ public class HandDown : MotionNote
         }
     }
 
-    public HandDown(string key, float start, float end = 0f) : this(start, end)
+    public HandDown(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         switch (key)
         {
@@ -29,7 +30,4 @@ public class HandDown : MotionNote
                 break;
         }
     }
-    public HandDown(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/HandUp.cs

@@ -11,7 +11,8 @@ public class HandUp : MotionNote
         }
     }
 
-    public HandUp(string key, float start, float end = 0f) : this(start, end)
+    public HandUp(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         switch (key)
         {
@@ -29,7 +30,4 @@ public class HandUp : MotionNote
                 break;
         }
     }
-    public HandUp(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/Headphone.cs

@@ -11,7 +11,8 @@ public class Headphone : MotionNote
         }
     }
 
-    public Headphone(string key, float start, float end = 0f) : this(start, end)
+    public Headphone(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         switch (key)
         {
@@ -29,6 +30,4 @@ public class Headphone : MotionNote
                 break;
         }
     }
-    public Headphone(float start, float end = 0f) : base(start, end)
-    { }
 }

Assets/MotionNotes/Jesus.cs

@@ -11,11 +11,9 @@ public class Jesus : MotionNote
         }
     }
 
-    public Jesus(string key, float start, float end = 0f) : this(start, end)
+    public Jesus(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         MotionName = "Jesus";
     }
-    public Jesus(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/Jump.cs

@@ -11,11 +11,9 @@ public class Jump : MotionNote
         }
     }
 
-    public Jump(string key, float start, float end = 0f) : this(start, end)
+    public Jump(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         MotionName = "Jump";
     }
-    public Jump(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/OnTheTable.cs

@@ -11,11 +11,9 @@ public class OnTheTable : MotionNote
         }
     }
 
-    public OnTheTable(string key, float start, float end = 0f) : this(start, end)
+    public OnTheTable(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         MotionName = "OnTheTable";
     }
-    public OnTheTable(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/MotionNotes/PushUp.cs

@@ -11,7 +11,8 @@ public class PushUp : MotionNote
         }
     }
 
-    public PushUp(string key, float start, float end = 0f) : this(start, end)
+    public PushUp(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end)
     {
         switch (key)
         {
@@ -41,7 +42,4 @@ public class PushUp : MotionNote
                 break;
         }
     }
-    public PushUp(float start, float end = 0f) : base(start, end)
-    {
-    }
 }

Assets/Script/MotionNote.cs

@@ -7,11 +7,9 @@ using UnityEngine;
 public abstract class MotionNote : Note
 {
     public abstract Sprite Image { get; }
-
-    public MotionNote(float start, float end = 0f)
-        : base(start == end ? NoteType.SMO : NoteType.LMO, start, end) { }
-    public MotionNote(string key, float start, float end = 0f)
-        : this(start, end) { }
+    
+    public MotionNote(string key, string type, float start, float end = 0f)
+        : base(key, type, start, end) { }
 
     public MotionSampleDisplay MotionSampleDisplay { get; set; }
 

Assets/TrackAnalysis/ButtonNoteMaker.cs

@@ -18,7 +18,7 @@
                 string type,
                 float timing)
         {
-            return new Note(code, type, timing, 0);
+            return new Note(code, type, timing);
         }
 
         override protected

Assets/TrackAnalysis/MotionNoteMaker.cs

 using System;
+using System.Reflection;
 
 namespace TrackAnalysis
 {
@@ -21,8 +22,8 @@ namespace TrackAnalysis
                 string type,
                 float timing)
         {
-            return (MotionNote)Activator.CreateInstance
-                (MotionNote.keymap[code], code, timing, 0);
+            return (Note)Activator.CreateInstance
+                (MotionNote.keymap[code], code, type, timing, 0);
         }
 
         override protected
@@ -35,8 +36,8 @@ namespace TrackAnalysis
             float start = Timing.Value;
             Timing = null;
 
-            return (MotionNote)Activator.CreateInstance
-                (MotionNote.keymap[type], code, start, timing);
+            return (Note)Activator.CreateInstance
+                (MotionNote.keymap[code], code, type, start, timing);
         }
     }
 }