aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-07-22 19:00:04 +0300
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-07-22 19:00:04 +0300
commitba40cacd3c4a60ccc9108d6acf7e813b1757dfd1 (patch)
tree883d44d8fd5f6d210ddf8e48748676f035f60792 /tests
parent1f13e8cd2c5bb091677f35e53ae5757774e7d1ba (diff)
Finish the testcase for extensions
Diffstat (limited to 'tests')
-rw-r--r--tests/extensions.options1
-rw-r--r--tests/extensions.proto10
-rw-r--r--tests/test_decode_extensions.c18
-rw-r--r--tests/test_encode_extensions.c6
4 files changed, 29 insertions, 6 deletions
diff --git a/tests/extensions.options b/tests/extensions.options
new file mode 100644
index 0000000..a5cd61d
--- /dev/null
+++ b/tests/extensions.options
@@ -0,0 +1 @@
+* max_size:16
diff --git a/tests/extensions.proto b/tests/extensions.proto
index 12c7c9a..cbffdce 100644
--- a/tests/extensions.proto
+++ b/tests/extensions.proto
@@ -3,3 +3,13 @@ import 'alltypes.proto';
extend AllTypes {
optional int32 AllTypes_extensionfield1 = 255;
}
+
+message ExtensionMessage {
+ extend AllTypes {
+ optional ExtensionMessage AllTypes_extensionfield2 = 254;
+ }
+
+ required string test1 = 1;
+ required int32 test2 = 2;
+}
+
diff --git a/tests/test_decode_extensions.c b/tests/test_decode_extensions.c
index b384c33..ef6a022 100644
--- a/tests/test_decode_extensions.c
+++ b/tests/test_decode_extensions.c
@@ -7,6 +7,11 @@
#include "alltypes.pb.h"
#include "extensions.pb.h"
+#define TEST(x) if (!(x)) { \
+ printf("Test " #x " failed.\n"); \
+ return 2; \
+ }
+
int main(int argc, char **argv)
{
uint8_t buffer[1024];
@@ -14,9 +19,14 @@ int main(int argc, char **argv)
pb_istream_t stream = pb_istream_from_buffer(buffer, count);
AllTypes alltypes = {};
+
int32_t extensionfield1;
pb_extension_t ext1 = {&AllTypes_extensionfield1, &extensionfield1, NULL};
alltypes.extensions = &ext1;
+
+ ExtensionMessage extensionfield2 = {};
+ pb_extension_t ext2 = {&ExtensionMessage_AllTypes_extensionfield2, &extensionfield2, NULL};
+ ext1.next = &ext2;
if (!pb_decode(&stream, AllTypes_fields, &alltypes))
{
@@ -24,11 +34,9 @@ int main(int argc, char **argv)
return 1;
}
- if (extensionfield1 != 12345)
- {
- printf("Wrong value for extension field: %d\n", extensionfield1);
- return 2;
- }
+ TEST(extensionfield1 == 12345)
+ TEST(strcmp(extensionfield2.test1, "test") == 0)
+ TEST(extensionfield2.test2 == 54321)
return 0;
}
diff --git a/tests/test_encode_extensions.c b/tests/test_encode_extensions.c
index c889dec..8857f14 100644
--- a/tests/test_encode_extensions.c
+++ b/tests/test_encode_extensions.c
@@ -11,10 +11,14 @@
int main(int argc, char **argv)
{
AllTypes alltypes = {};
+
int32_t extensionfield1 = 12345;
pb_extension_t ext1 = {&AllTypes_extensionfield1, &extensionfield1, NULL};
-
alltypes.extensions = &ext1;
+
+ ExtensionMessage extensionfield2 = {"test", 54321};
+ pb_extension_t ext2 = {&ExtensionMessage_AllTypes_extensionfield2, &extensionfield2, NULL};
+ ext1.next = &ext2;
uint8_t buffer[1024];
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));