Merge branch 'nolink-brk'

This commit is contained in:
lyon 2021-09-03 07:37:30 +08:00
commit 7e67edb75d
4 changed files with 46 additions and 59 deletions

2
.vscode/launch.json vendored
View File

@ -10,7 +10,7 @@
"request": "launch",
"program": "${workspaceFolder}/build/src/test/pikascript_test",
"args": [
"--gtest_filter=args.buff"
"--gtest_filter=args.update"
],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",

@ -1 +1 @@
Subproject commit d8c23427739fce6831506810d3cceba405c5980e
Subproject commit f7e878363d1cf8090e457b551143a34c4ab8aed3

View File

@ -79,7 +79,17 @@ TEST(args, print_int)
{
Args *args = New_args(NULL);
args_setInt(args, (char *)"testInt", 124);
EXPECT_EQ(1, strEqu((char *)"124", args_print(args, (char *)"testInt")));
EXPECT_STREQ((char *)"124", args_print(args, (char *)"testInt"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(args, update)
{
Args *args = New_args(NULL);
args_setInt(args, (char *)"testInt", 124);
args_setInt(args, (char *)"testInt", 125);
EXPECT_EQ(125, args_getInt(args, (char *)"testInt"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -91,7 +101,7 @@ TEST(args, test5)
args_bind(args, (char *)"int", (char *)"testInt", &testInt);
char *type = args_getType(args, (char *)"testInt");
args_print(args, (char *)"testInt");
EXPECT_EQ(1, strEqu((char *)"124", args_print(args, (char *)"testInt")));
EXPECT_STREQ((char *)"124", args_print(args, (char *)"testInt"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -100,7 +110,7 @@ TEST(args, test6)
{
Args *args = New_args(NULL);
args_setFloat(args, (char *)"testfloat", 1.42);
EXPECT_TRUE(strEqu((char *)"1.420000", args_print(args, (char *)"testfloat")));
EXPECT_STREQ((char *)"1.420000", args_print(args, (char *)"testfloat"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -109,7 +119,7 @@ TEST(args, test7)
Args *args = New_args(NULL);
float floatBindTest = 2.314;
args_bind(args, (char *)"float", (char *)"floatBind", &floatBindTest);
EXPECT_TRUE(strEqu((char *)"2.314000", args_print(args, (char *)"floatBind")));
EXPECT_STREQ((char *)"2.314000", args_print(args, (char *)"floatBind"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -118,7 +128,7 @@ TEST(args, test8)
{
Args *args = New_args(NULL);
args_setStr(args, (char *)"testString", (char *)"test string print");
EXPECT_TRUE(strEqu((char *)"test string print", args_print(args, (char *)"testString")));
EXPECT_STREQ((char *)"test string print", args_print(args, (char *)"testString"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -128,7 +138,7 @@ TEST(args, test9)
Args *args = New_args(NULL);
char strBindTest[] = "test string bind";
args_bindStr(args, (char *)"testStringBind", (char **)&strBindTest);
EXPECT_TRUE(strEqu((char *)"test string bind", args_print(args, (char *)"testStringBind")));
EXPECT_STREQ((char *)"test string bind", args_print(args, (char *)"testStringBind"));
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}

View File

@ -7,53 +7,6 @@ extern "C"
}
static int mem;
TEST(content, get)
{
uint8_t *self = (uint8_t *)pikaMalloc(16);
self[0] = 'n';
self[1] = 'a';
self[2] = 'm';
self[3] = 'e';
self[4] = '\0';
self[5] = 't';
self[6] = 'y';
self[7] = 'p';
self[8] = 'e';
self[9] = '\0';
self[10] = 4;
self[11] = 0;
self[12] = 1;
self[13] = 2;
self[14] = 3;
self[15] = 4;
uint16_t contentOffset = content_contentOffset(self);
uint16_t typeOffset = content_typeOffset(self);
uint16_t sizeOffset = content_sizeOffset(self);
char *name = content_getName(self);
char *type = content_getType(self);
uint16_t size = content_getSize(self);
uint8_t *content = content_getContent(self);
uint16_t totleSize = content_totleSize(self);
ASSERT_EQ(contentOffset, 12);
ASSERT_EQ(typeOffset, 5);
ASSERT_EQ(sizeOffset, 10);
ASSERT_EQ(size, 4);
ASSERT_EQ(content[0], 1);
ASSERT_EQ(content[1], 2);
ASSERT_EQ(content[2], 3);
ASSERT_EQ(content[3], 4);
ASSERT_EQ(totleSize, 16);
ASSERT_STREQ((char *)"name", name);
ASSERT_STREQ((char *)"type", type);
content_deinit(self);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(content, init)
{
uint8_t contentIn[4] = {0};
@ -62,7 +15,7 @@ TEST(content, init)
contentIn[2] = 3;
contentIn[3] = 4;
uint16_t sizeIn = 4;
uint8_t *self = content_init((char *)"name", (char *)"type", contentIn, 4);
uint8_t *self = content_init((char *)"name", (char *)"type", contentIn, 4, NULL);
uint16_t typeOffset = content_typeOffset(self);
uint16_t sizeOffset = content_sizeOffset(self);
@ -82,7 +35,7 @@ TEST(content, init)
ASSERT_EQ(content[1], 2);
ASSERT_EQ(content[2], 3);
ASSERT_EQ(content[3], 4);
ASSERT_EQ(totleSize, 16);
ASSERT_EQ(totleSize, 24);
ASSERT_STREQ((char *)"name", name);
ASSERT_STREQ((char *)"type", type);
@ -98,7 +51,7 @@ TEST(content, set)
contentIn[1] = 2;
contentIn[2] = 3;
contentIn[3] = 4;
uint8_t *self = content_init((char *)"", (char *)"", NULL, 0);
uint8_t *self = content_init((char *)"", (char *)"", NULL, 0, NULL);
self = content_setName(self, (char *)"name");
self = content_setType(self, (char *)"type");
self = content_setContent(self, contentIn, 4);
@ -121,11 +74,35 @@ TEST(content, set)
ASSERT_EQ(content[1], 2);
ASSERT_EQ(content[2], 3);
ASSERT_EQ(content[3], 4);
ASSERT_EQ(totleSize, 16);
ASSERT_EQ(totleSize, 24);
ASSERT_STREQ("name", name);
ASSERT_STREQ("type", type);
content_deinit(self);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(content, next)
{
uint8_t *c1 = content_init((char *)"c1", (char *)"type", NULL, 0, NULL);
uint8_t *c2 = content_init((char *)"c2", (char *)"type", NULL, 0, c1);
uint8_t *c3 = content_getNext(c2);
ASSERT_EQ(c3, c1);
content_deinit(c1);
content_deinit(c2);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(content, setNext)
{
uint8_t *c1 = content_init((char *)"c1", (char *)"type", NULL, 0, NULL);
content_setNext(c1, content_init((char *)"c2", (char *)"type", NULL, 0, NULL));
uint8_t *c2 = content_getNext(c1);
char *c2Name = content_getName(c2);
EXPECT_STREQ(c2Name, (char *)"c2");
content_deinit(c1);
content_deinit(c2);
EXPECT_EQ(pikaMemNow(), 0);
}