Enabled working tests after bf2e3cdfae

master
krzys-h 2016-06-17 22:49:15 +02:00
parent bf2e3cdfae
commit f0ed20fd67
1 changed files with 16 additions and 6 deletions

View File

@ -471,6 +471,18 @@ TEST_F(CBotUT, VarImplicitCast)
//" ASSERT(b == \"3.5\");\n" //" ASSERT(b == \"3.5\");\n"
"}\n" "}\n"
); );
ExecuteTest(
"string func()\n"
"{\n"
" return 5;\n"
"}\n"
"extern void ImplicitCastOnReturn()\n"
"{\n"
" string a = func();\n"
" ASSERT(a == \"5\");"
"}\n"
);
} }
TEST_F(CBotUT, Arrays) TEST_F(CBotUT, Arrays)
@ -660,8 +672,7 @@ TEST_F(CBotUT, FunctionRedefined)
); );
} }
// TODO: Doesn't work TEST_F(CBotUT, FunctionBadReturn)
TEST_F(CBotUT, DISABLED_FunctionBadReturn)
{ {
ExecuteTest( ExecuteTest(
"int func()\n" "int func()\n"
@ -672,7 +683,7 @@ TEST_F(CBotUT, DISABLED_FunctionBadReturn)
"{\n" "{\n"
" int a = func();\n" " int a = func();\n"
"}\n", "}\n",
static_cast<CBotError>(-1) // TODO: no error for that CBotErrBadType1
); );
} }
@ -932,12 +943,11 @@ TEST_F(CBotUT, ThisEarlyContextSwitch_Issue436)
); );
} }
// TODO: Gets a failed assertion TEST_F(CBotUT, ClassStringAdd_Issue535)
TEST_F(CBotUT, DISABLED_BadStringAdd_Issue535)
{ {
ExecuteTest( ExecuteTest(
"public class TestClass {}\n" "public class TestClass {}\n"
"extern void BadStringAdd()\n" "extern void ClassStringAdd()\n"
"{\n" "{\n"
" TestClass t();\n" " TestClass t();\n"
" string s = t + \"!\";\n" " string s = t + \"!\";\n"