Improve cover (optimized mode) closes #60

eelstork · eelstork · commit 366d3ab579f2 · 2020-11-23T16:34:12.000+08:00
diff --git a/Src/Details/Stateful/AbstractDecoratorDetails.cs b/Src/Details/Stateful/AbstractDecoratorDetails.cs
@@ -35,7 +35,11 @@ public LogData(AbstractDecorator s, object tg, string r){
         }
 
         public string Reason()
+        #if AL_OPTIMIZE
+        => null;
+        #else
         => TraceFormat.DecoratorReason(target, reason);
+        #endif
 
     }
 
diff --git a/Src/Details/StatusDetails.cs b/Src/Details/StatusDetails.cs
@@ -49,13 +49,13 @@ internal status(in status s, LogTrace trace){
 
     status(in status s, int value){ this = s; ω = value; }
 
-    status(in status s, in status prev){
+    internal status(in status s, in status prev){
         this = s;
         meta = log ? new Meta(meta, prev: new Ref(prev))
                    : new Meta(meta);
     }
 
-    status(in status s, in status prev, int value){
+    internal status(in status s, in status prev, int value){
         this = s; ω = value;
         meta = log ? new Meta(meta, prev: new Ref(prev))
                    : new Meta(meta);
@@ -96,7 +96,9 @@ public override bool Equals(object x)
 
     public override int GetHashCode() => ω;
 
-    public override string ToString() => StatusFormat.ToString(this);
+    public override string ToString()
+    => (ω >= -1 || ω <= +1) ? StatusFormat.ToString(this)
+                            : $"invalid_status({ω})";
 
     internal static status @unchecked(int value)
     => new status(value, @unchecked: true);
diff --git a/Src/Details/StatusDetailsOptimized.cs b/Src/Details/StatusDetailsOptimized.cs
@@ -15,11 +15,16 @@ internal status(int value, LogTrace trace=null, status[] children = null)
 
     internal status(StatusValue value, LogTrace trace=null) => ω = (int)value;
 
-    status(int value)                              => ω = value;
-    status(in status s, LogTrace trace)            => this = s;
-    status(in status s, int value)                 => ω = value;
-    status(in status s, in status prev)            => this = s;
-    status(in status s, in status prev, int value) => ω = value;
+    internal status(int value) => ω = value;
+
+    internal status(in status s, LogTrace trace) => this = s;
+
+    internal status(in status s, int value) => ω = value;
+
+    internal status(in status s, in status prev) => this = s;
+
+    internal status(in status s, in status prev, int value)
+    => ω = value;
 
     public static status operator & (status x, status y) => y;
     public static status operator | (status x, status y) => y;
@@ -55,9 +60,10 @@ public override string ToString(){
         }
     }
 
-    internal status ViaScope(object scope, string reason=null) => this;
+    //internal status ViaScope(object scope, string reason=null) => this;
 
-    static LogTrace LogTrace(object scope, string reason=null) => null;
+    //internal static LogTrace LogTrace(object scope,
+    //                                  string reason=null) => null;
 
 }}
 
diff --git a/Src/Details/StatusFormat.cs b/Src/Details/StatusFormat.cs
@@ -18,12 +18,12 @@ public class StatusFormat{
 
 	public static string Decorator(object x) => $"<{x.GetType().Name[0]}>";
 
-	public static string LastPathComponent(string path) => path.Substring(
-		path.LastIndexOf(System.IO.Path.DirectorySeparatorChar) + 1
-	).Replace(".cs", null);
-
   #if !AL_OPTIMIZE
 
+    public static string LastPathComponent(string path) => path.Substring(
+	    path.LastIndexOf(System.IO.Path.DirectorySeparatorChar) + 1
+    ).Replace(".cs", null);
+
 	public static string CallTree(in status status){
 		var builder = new StringBuilder();
 		Hierarchy(status, builder, tabs: Tabs);
diff --git a/Src/Details/TraceFormat.cs b/Src/Details/TraceFormat.cs
@@ -1,3 +1,7 @@
+#if !(UNITY_EDITOR || DEBUG)
+#define AL_OPTIMIZE
+#endif
+
 using System;
 using ArgEx = System.ArgumentException;
 
@@ -25,6 +29,7 @@ public static string LogTrace(LogTrace trace){
 		return trace.next == null ? @out : $"{@out} -> {LogTrace(trace.next)}";
 	}
 
+	#if !AL_OPTIMIZE
 	public static string DecoratorReason(object target, string reason)
 		=> ( (string)target == "."
 			 ? $"{ReasonField(reason)}"
@@ -33,6 +38,7 @@ public static string DecoratorReason(object target, string reason)
 	public static string Scope(LogTrace t) => t?.scope.ToString();
 
 	static string DecoratorTarget(object target) => target?.ToString() ?? "?";
+	#endif
 
 	/* Used by TraceFormat.LogTrace */
 	static string Reason(string reason, bool isDecorator)
diff --git a/Src/Gig.cs b/Src/Gig.cs
@@ -13,7 +13,11 @@ public abstract partial class Gig {
     protected static readonly LogString log = null;
 
     public virtual status Step()
+    #if AL_OPTIMIZE
+    => status._fail;
+    #else
     => status.fail(log && "`Step` is not implemented");
+    #endif
 
     public action Do(params object[] x) => @void();
 
diff --git a/Tests/Decorators/TestAbstractDecorator.cs b/Tests/Decorators/TestAbstractDecorator.cs
@@ -1,10 +1,20 @@
+#if !(UNITY_EDITOR || DEBUG)
+#define AL_OPTIMIZE
+#endif
+
 using NUnit.Framework;
 using Active.Core;
 using Active.Core.Details;
 
 public class TestAbstractDecorator
              : DecoratorTest<TestAbstractDecorator.Concrete>{
 
+    #if AL_OPTIMIZE
+    [Test] public void Reason_isNull() => o(
+        new AbstractDecorator.LogData(null, null, null)
+        .Reason(), null );
+    #endif
+
     [Test] public void Nature(){
         o( x is Resettable );
         o( x is IDecorator );
diff --git a/Tests/StringsTest.cs b/Tests/StringsTest.cs
@@ -0,0 +1,11 @@
+using NUnit.Framework;
+using Active.Core;
+
+public class TestStrings : TestBase{
+
+    [Test] public void StatusValues(){
+        o( Strings.status.names,
+           new string[]{"failing", "running", "done"});
+    }
+
+}
diff --git a/Tests/TestLogTrace.cs b/Tests/TestLogTrace.cs
@@ -15,9 +15,15 @@ [Test] public void Constructors_nologging(){
 
     // TODO - don't think LogTrace allows a null scope; then
     // the `?.` in `Matches` will never be used.
-    [Test] public void Matches(){
+    [Test] public void Matches_1(){
         var trace = new LogTrace(new object(), null);
         trace.Matches(null, null);
     }
 
+    [Test] public void Matches_2(){
+        var obj = "foo";
+        var trace = new LogTrace("foo", null);
+        trace.Matches(obj, null);
+    }
+
 }
diff --git a/Tests/TestStatus.cs b/Tests/TestStatus.cs
@@ -20,11 +20,36 @@ public class TestStatus : CoreTest {
 	[Test] public void Fail_Func()    => o ( fail().failing  );
 	[Test] public void Running_Func() => o ( cont().running  );
 
-    #if !AL_OPTIMIZE
+	// --------------------------------------------------------------
 
-    LogString log = null;
+	#if AL_OPTIMIZE
+	// optimized mode
+	[Test] public void Construct_withLogTrace(){
+		status a = done();
+		o( new status(a, trace: null).complete );
+	}
+
+	// optimized mode
+	[Test] public void ToString_(){
+		o ( fail.ToString() , "fail" );
+		o ( cont.ToString() , "cont" );
+		o ( done.ToString(),  "done"    );
+		o ( status.@unchecked(5).ToString(), "invalid_status(5)");
+	}
+
+	// optimized mode
+	[Test] public void Indexer(){
+		o( done[null].complete );
+	}
+
+	// optimized mode
+	[Test] public void WithValidString(){
+		o( (done % (ValidString)null).complete );
+	}
+
+	#endif
 
-	[Test] public void Construct_value_and_trace(
+	[Test] public void Construct_withValueAndTrace(
 									 [Values(true, false)] bool lg){
 		var _log = status.log;
 		//
@@ -33,6 +58,30 @@ [Test] public void Construct_value_and_trace(
 		status.log = _log;
 	}
 
+	[Test] public void Construct_withStatusAndPrev_1(){
+		status a = done(), b = fail();
+		o( new status(a, prev: b).complete );
+	}
+
+	[Test] public void Construct_withStatusAndPrev_2()
+	=> o( new status(done(), prev: fail(), value: 5).complete);
+
+	[Test] public void Equals_type_mismatch(){
+		o(done.Equals( "1" ), false);
+	}
+
+	// Optimized mode
+	[Test] public void ViaDecorator()
+	=> o( done.ViaDecorator(null, null).complete );
+
+	// optimized mode
+	//[Test] public void LogTrace()
+	//=> o( status.LogTrace(null, null), null );
+
+	#if !AL_OPTIMIZE
+
+	LogString log = null;
+
 	[Test] public void Construct_logtraceMissing(){
 		Assert.Throws<ArgEx>( () =>
 			{ var z = new status(0, null, null); });
@@ -63,10 +112,6 @@ [Test] public void ConstructWithCIAndReason(){
 		}
 	}
 
-	[Test] public void Equals_type_mismatch(){
-		o(done.Equals( "1" ), false);
-	}
-
 	[Test] public void Validate(){
 		Assert.Throws<ArgEx>( () => status.Validate(12) );
 	}
@@ -107,6 +152,7 @@ [Test] public void ToString_(){
 		o ( fail.ToString() , "failing ()" );
 		o ( cont.ToString() , "running ()" );
 		o ( done.ToString(),  "done ()"    );
+		//o ( new status(5).ToString(), "invalid_status(5)");
 	}
 
 	[Test] public void Condoner_withTrace(){
@@ -143,11 +189,12 @@ [Test] public void Eval(){
 
 	[Test] public void StatusConsts(){
 		o( (status)status.@void(),   done);
+		o( (status)status.@false(),  fail);
 		o( (status)status.flop(),    fail);
 		o( (status)status.forever(), cont);
 	}
 
-	#pragma warning restore 612
+	#pragma warning restore 618
 
 	// ==============================================================
 
@@ -282,7 +329,9 @@ [Test] public void Truehood(){
 	}
 
 	// Don't know how to test this
-    [Test] public void Falsehood(){}
+    [Test] public void Falsehood(){
+		o( done && @fail, @fail );
+	}
 
     [Test] public void RunningIsTrueAndFalse(){
 		if(cont) Assert.Pass(); else Assert.Fail();

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ public LogData(AbstractDecorator s, object tg, string r){`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public string Reason()`
	`38`	`+ #if AL_OPTIMIZE`
	`39`	`+ => null;`
	`40`	`+ #else`
`38`	`41`	`=> TraceFormat.DecoratorReason(target, reason);`
	`42`	`+ #endif`
`39`	`43`
`40`	`44`	`}`
`41`	`45`