git-svn-id: svn://ultimatepp.org/upp/trunk@4376 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-01-09 09:56:15 +00:00
parent 5f97e50527
commit fe83e66c35
2 changed files with 226 additions and 210 deletions

View file

@ -1,153 +1,163 @@
#include "SvoValue.h"
void DumpNumber(const Value& v)
{
RDUMP((int)v);
RDUMP((double)v);
RDUMP((int64)v);
RDUMP((bool)v);
}
int xx;
Value Opt0();
void Opt() {
Value v = Opt0();
xx = v;
}
void CheckString()
{
Value v = "ahoj";
for(int i = 0; i < 2; i++) {
String s = v;
RDUMP(s);
ASSERT(s == "ahoj");
WString ws = v;
RDUMP(ws);
ASSERT(ws == WString("ahoj"));
v = ws;
}
v = String("ahoj");
Value w = WString("ahoj");
ASSERT(v == w);
RDUMP(GetHashValue(v));
RDUMP(GetHashValue(w));
ASSERT(GetHashValue(v) == GetHashValue(w));
}
void CheckDateTime()
{
Time tm = GetSysTime();
Date dt = tm;
Value c;
Value v = tm;
RDUMP(v);
ASSERT(v == dt);
Date xx = v;
ASSERT(xx == dt);
c = v;
RDUMP(c);
ASSERT(c == dt);
Value cv = v;
RDUMP(cv);
ASSERT(cv == dt);
Value v2 = tm;
RDUMP(v2);
ASSERT(v2 == v);
c = v;
RDUMP(c);
ASSERT(c == dt);
ASSERT(c == tm);
v = dt;
v2 = ToTime(v);
ASSERT(v == v2);
ASSERT(GetHashValue(v) == GetHashValue(v2));
}
void CheckValueMap()
{
RLOG("------------------------------");
RLOG("CheckValueMap");
Value x = 123;
Value y = x;
ValueMap h;
h.Add("0", 123);
RDUMP(h["0"]);
h.Add("1", Date(2001, 12, 1));
h.Add("2", "test");
Value v = h;
ASSERT(v.GetCount() == 3);
RDUMP(v["0"]);
ASSERT(v["0"] == 123);
ASSERT(v["1"] == Date(2001, 12, 1));
ASSERT(v["2"] == "test");
ValueMap hh = v;
ASSERT(hh == h);
}
void OtherChecks()
{
Value c;
ASSERT(c.IsVoid());
RDUMP(c.IsVoid());
Value x = "Ahoj";
String xx = x;
RDUMP(xx);
ASSERT(xx == "Ahoj");
Value xw = WString("Ahoj");
RDUMP(xw);
RDUMP(xw == x);
Value xc = x;
RDUMP(xc);
c = xc;
RDUMP(c);
Value y = 123;
int yy = y;
RDUMP(yy);
Value xn = (int)Null;
RDUMP(IsNull(xn));
RDUMP(IsNull(yy));
Value yc = y;
RDUMP(y);
c = y;
RDUMP(c);
Value v2 = 123.0;
Value v3 = 123;
Value v4 = 125;
RDUMP(v2 == y);
RDUMP(v3 == y);
RDUMP(v4 == y);
RDUMP(v4 == v2);
Value uu = Uuid::Create();
RDUMP(uu);
Value uuc = uu;
RDUMP(uuc);
{
Color c = Blue;
Value v = c;
RDUMP(v);
Value v2 = v;
c = v2;
RDUMP(c);
}
}
#include "SvoValue.h"
void DumpNumber(const Value& v)
{
RDUMP((int)v);
RDUMP((double)v);
RDUMP((int64)v);
RDUMP((bool)v);
}
int xx;
Value Opt0();
void Opt() {
Value v = Opt0();
xx = v;
}
void CheckString()
{
Value v = "ahoj";
for(int i = 0; i < 2; i++) {
String s = v;
RDUMP(s);
ASSERT(s == "ahoj");
WString ws = v;
RDUMP(ws);
ASSERT(ws == WString("ahoj"));
v = ws;
}
v = String("ahoj");
Value w = WString("ahoj");
ASSERT(v == w);
RDUMP(GetHashValue(v));
RDUMP(GetHashValue(w));
ASSERT(GetHashValue(v) == GetHashValue(w));
}
void CheckDateTime()
{
Time tm = GetSysTime();
Date dt = tm;
Value c;
Value v = tm;
RDUMP(v);
ASSERT(v == dt);
Date xx = v;
ASSERT(xx == dt);
c = v;
RDUMP(c);
ASSERT(c == dt);
Value cv = v;
RDUMP(cv);
ASSERT(cv == dt);
Value v2 = tm;
RDUMP(v2);
ASSERT(v2 == v);
c = v;
RDUMP(c);
ASSERT(c == dt);
ASSERT(c == tm);
v = dt;
v2 = ToTime(v);
ASSERT(v == v2);
ASSERT(GetHashValue(v) == GetHashValue(v2));
}
void CheckValueMap()
{
RLOG("------------------------------");
RLOG("CheckValueMap");
Value x = 123;
Value y = x;
ValueMap h;
h.Add("0", 123);
RDUMP(h["0"]);
h.Add("1", Date(2001, 12, 1));
h.Add("2", "test");
Value v = h;
ASSERT(v.GetCount() == 3);
RDUMP(v["0"]);
ASSERT(v["0"] == 123);
ASSERT(v["1"] == Date(2001, 12, 1));
ASSERT(v["2"] == "test");
ValueMap hh = v;
ASSERT(hh == h);
hh.Add(123, "foo");
ASSERT(hh.GetCount() == 4);
ASSERT(v.GetCount() == 3);
ASSERT(hh[123] == "foo");
ValueArray va = v;
ASSERT(va.GetCount() == 3);
ASSERT(va[0] == 123);
ASSERT(va[1] == Date(2001, 12, 1));
ASSERT(va[2] == "test");
}
void OtherChecks()
{
Value c;
ASSERT(c.IsVoid());
RDUMP(c.IsVoid());
Value x = "Ahoj";
String xx = x;
RDUMP(xx);
ASSERT(xx == "Ahoj");
Value xw = WString("Ahoj");
RDUMP(xw);
RDUMP(xw == x);
Value xc = x;
RDUMP(xc);
c = xc;
RDUMP(c);
Value y = 123;
int yy = y;
RDUMP(yy);
Value xn = (int)Null;
RDUMP(IsNull(xn));
RDUMP(IsNull(yy));
Value yc = y;
RDUMP(y);
c = y;
RDUMP(c);
Value v2 = 123.0;
Value v3 = 123;
Value v4 = 125;
RDUMP(v2 == y);
RDUMP(v3 == y);
RDUMP(v4 == y);
RDUMP(v4 == v2);
Value uu = Uuid::Create();
RDUMP(uu);
Value uuc = uu;
RDUMP(uuc);
{
Color c = Blue;
Value v = c;
RDUMP(v);
Value v2 = v;
c = v2;
RDUMP(c);
}
}

View file

@ -1,57 +1,63 @@
#include "SvoValue.h"
CONSOLE_APP_MAIN
{
Value v;
ASSERT(v.IsVoid());
CheckType(Value(), true);
CheckType(String("ahoj"), false, true);
CheckType(WString("ahoj"));
CheckType(123);
CheckType(123.0, false, true);
CheckType(true);
CheckType((int64)123);
CheckType(Date(2012, 1, 1));
CheckType(Time(2012, 1, 1, 15, 30), false, true);
ValueArray va;
va.Add(123);
CheckType(va, false, true);
ValueMap map;
map.Add("1", 1);
map.Add("2", 2);
CheckType(map, false, true);
CheckType(Size(20, 20), false, true);
CheckType(Rect(0, 0, 123, 123), false, true);
CheckType(Blue(), false, true);
CheckType(Uuid::Create(), false, true);
v = ErrorValue("error");
CheckType(v, true);
ASSERT(v.IsVoid());
ASSERT(v.IsError());
RDUMP(GetErrorText(v));
ASSERT(GetErrorText(v) == "error");
CheckValueMap();
CheckNumber<int>();
CheckNumber<double>();
CheckNumber<int64>();
CheckNumber<bool>();
RLOG("------------------------------");
RLOG("CheckString");
CheckString();
RLOG("------------------------------");
RLOG("CheckDateTime");
CheckDateTime();
RLOG("------------------------------");
RLOG("OtherChecks");
OtherChecks();
RLOG("------------------------------");
RLOG("######## Everything is OK");
}
#include "SvoValue.h"
CONSOLE_APP_MAIN
{
StdLogSetup(LOG_COUT|LOG_FILE);
Value v;
ASSERT(v.IsVoid());
CheckType(Value(), true);
CheckType(String("ahoj"), false, true);
CheckType(WString("ahoj"));
CheckType(123);
CheckType(123.0, false, true);
CheckType(true);
CheckType((int64)123);
CheckType(Date(2012, 1, 1));
CheckType(Time(2012, 1, 1, 15, 30), false, true);
ValueArray va;
va.Add(123);
va.Add("ahoj");
ASSERT(va.GetCount() == 2);
ASSERT(va[0] == 123);
ASSERT(va[1] == "ahoj");
CheckType(va, false, true);
ValueMap map;
map.Add("1", 1);
map.Add("2", 2);
CheckType(map, false, true);
CheckType(Size(20, 20), false, true);
CheckType(Rect(0, 0, 123, 123), false, true);
CheckType(Blue(), false, true);
CheckType(Uuid::Create(), false, true);
v = ErrorValue("error");
CheckType(v, true);
ASSERT(v.IsVoid());
ASSERT(v.IsError());
RDUMP(GetErrorText(v));
ASSERT(GetErrorText(v) == "error");
CheckValueMap();
CheckNumber<int>();
CheckNumber<double>();
CheckNumber<int64>();
CheckNumber<bool>();
RLOG("------------------------------");
RLOG("CheckString");
CheckString();
RLOG("------------------------------");
RLOG("CheckDateTime");
CheckDateTime();
RLOG("------------------------------");
RLOG("OtherChecks");
OtherChecks();
RLOG("------------------------------");
RLOG("######## Everything is OK");
}