Просмотр исходного кода

Use of enumeration ETestResult instead of Int32

Dexter89 11 лет назад
Родитель
Сommit
adb886e8a1

+ 3 - 3
tools/gui/crown-tests/MainWindow.cs

@@ -19,11 +19,11 @@ namespace crown_tests
 			twTests.AppendColumn("State", new Gtk.CellRendererText());
 			TreeViewTemplating.AddRowTemplate(twTests, 
 				TreeViewRowTemplate.Create(typeof(TestCategory))
-																				.SetBinding("Name", "Name"));
+													 .SetBinding("Name", "Name"));
 			TreeViewTemplating.AddRowTemplate(twTests, 
 				TreeViewRowTemplate.Create(typeof(Test))
-																				.SetBinding("Name", "Name")
-																				.SetBinding("State", "LastResult", (x) => object.Equals(x, 0) ? "Passed" : "Failed"));
+													 .SetBinding("Name", "Name")
+													 .SetBinding("State", "LastResult"));
 			TreeViewTemplating.ApplyTemplating(twTests);
 
 

+ 8 - 3
tools/gui/crown-tests/tests/Test.cs

@@ -6,6 +6,12 @@ using System.Text;
 
 namespace crown_tests.tests
 {
+	public enum ETestResult {
+		Unknown = 0,
+		Failed = 1,
+		Passed = 2
+	}
+
 	[JsonObject(MemberSerialization.OptIn)]
 	public class Test: ViewModelBase
 	{
@@ -15,9 +21,8 @@ namespace crown_tests.tests
 		[JsonProperty]
 		public String Description { get; set; }
 
-		int mLastResult;
-
-		public int LastResult { 
+		ETestResult mLastResult;
+		public ETestResult LastResult { 
 			get { return mLastResult; }
 			set {
 				if (mLastResult != value) {

+ 1 - 1
tools/gui/crown-tests/tests/TestExecutor.cs

@@ -26,7 +26,7 @@ namespace crown_tests.tests
 					p.StartInfo.Arguments = string.Format("/test:\"{0}\"", test.Name);
 					p.Start();
 					p.WaitForExit();
-					test.LastResult = p.ExitCode;
+					test.LastResult = (p.ExitCode == 0) ? ETestResult.Passed : ETestResult.Failed;
 					System.Threading.Thread.Sleep(1500);
 				}
 			}