From 3867d880fa2e05c5df03310f0e736dd369b7d6df Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 13 Nov 2013 13:16:09 +0000
Subject: [PATCH] .upptst

git-svn-id: svn://ultimatepp.org/upp/trunk@6549 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 upptst/S_type/S_type.cpp | 14 ++++++++++++--
 upptst/S_type/S_type.sch |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/upptst/S_type/S_type.cpp b/upptst/S_type/S_type.cpp
index c8d797422..ca3d43c3f 100644
--- a/upptst/S_type/S_type.cpp
+++ b/upptst/S_type/S_type.cpp
@@ -32,26 +32,36 @@ CONSOLE_APP_MAIN
 		test.Clear();
 		DUMP(test);
 		for(int i = 0; i < test.GetCount(); i++) {
-			ASSERT(IsNull(test.Get(i)));
 			Ref f = test.GetRef(i);
+			if(!f.Is<bool>())
+				ASSERT(IsNull(test.Get(i)));
 			Value v;
+			if(f.Is<bool>())
+				v = (bool)(i % 2);
+			else
 			if(f.Is<int>())
 				v = i + 1000;
 			else
 				v = "text " + AsString(i);
 			m.Add(test.GetId(i), v);
 			test.Set(i, v);
+			ASSERT(test.Get(i) == v);
 		}
 		DUMP(test);
 		DUMP(test.Get());
 		ASSERT(test.Get() == m);
 	}
 	
+	test.Set(FLAG, "1");
+	ASSERT(test.FLAG);
+	test.Set(FLAG, "0");
+	ASSERT(!test.FLAG);
+	
 	LOG("------------------------");
 	ASSERT(test.Get(TEST).IsVoid());
 	
 	ValueMap m;
-	m(TEXT, "texttest")(NUMBER1, 123456)(A[2], 10);
+	m(TEXT, "texttest")(NUMBER1, 123456)(A[2], 10)(FLAG, true)(FLAG2, "1");
 	test.Set(m);
 	DUMP(test);
 	test = m;
diff --git a/upptst/S_type/S_type.sch b/upptst/S_type/S_type.sch
index 98680472b..db726cf49 100644
--- a/upptst/S_type/S_type.sch
+++ b/upptst/S_type/S_type.sch
@@ -2,6 +2,8 @@ TABLE_ (BASE1)
 	INT_       (NUMBER1)
 	STRING_	   (TEXT1, 200)
 	INT_ARRAY_ (A, 5)
+	BOOL_      (FLAG)
+	BOOL_      (FLAG2)
 END_TABLE
 
 TABLE_ (BASE2)