[colobot] 114/145: Enabled working tests after bf2e3cdfaeb7114cc5ec60cb601b8f5305cbf4e6
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit f0ed20fd670d62fd8b6f2977f37cbd5a94fad310
Author: krzys-h <krzys_h at interia.pl>
Date: Fri Jun 17 22:49:15 2016 +0200
Enabled working tests after bf2e3cdfaeb7114cc5ec60cb601b8f5305cbf4e6
---
test/unit/CBot/CBot_test.cpp | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/test/unit/CBot/CBot_test.cpp b/test/unit/CBot/CBot_test.cpp
index e3c25db..355e37a 100644
--- a/test/unit/CBot/CBot_test.cpp
+++ b/test/unit/CBot/CBot_test.cpp
@@ -471,6 +471,18 @@ TEST_F(CBotUT, VarImplicitCast)
//" ASSERT(b == \"3.5\");\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)
@@ -660,8 +672,7 @@ TEST_F(CBotUT, FunctionRedefined)
);
}
-// TODO: Doesn't work
-TEST_F(CBotUT, DISABLED_FunctionBadReturn)
+TEST_F(CBotUT, FunctionBadReturn)
{
ExecuteTest(
"int func()\n"
@@ -672,7 +683,7 @@ TEST_F(CBotUT, DISABLED_FunctionBadReturn)
"{\n"
" int a = func();\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, DISABLED_BadStringAdd_Issue535)
+TEST_F(CBotUT, ClassStringAdd_Issue535)
{
ExecuteTest(
"public class TestClass {}\n"
- "extern void BadStringAdd()\n"
+ "extern void ClassStringAdd()\n"
"{\n"
" TestClass t();\n"
" string s = t + \"!\";\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list