Add test case for #637

4 files changed, 38 insertions, 0 deletions

diff --git a/tests/regression/issue_637/SConscript b/tests/regression/issue_637/SConscript
new file mode 100644
index 0000000..55319d9
--- /dev/null
+++ b/tests/regression/issue_637/SConscript
@@ -0,0 +1,9 @@
+# Regression test for #637:
+# Generator produces incorrect output when a oneof is used
+
+Import("env")
+
+env.NanopbProto("other.proto")
+env.NanopbProto(["oneof.proto", "other.proto"])
+env.Object("oneof.pb.c")
+env.Object("test.c")
diff --git a/tests/regression/issue_637/oneof.proto b/tests/regression/issue_637/oneof.proto
new file mode 100644
index 0000000..ce47bf8
--- /dev/null
+++ b/tests/regression/issue_637/oneof.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+import "other.proto";
+
+message FirstOneof {}
+
+message Bar {
+  oneof content {
+    FirstOneof first = 1;
+    SecondOneof second = 2;
+  }
+}
+
+message Foo {
+  Bar bar = 1;
+}
+
+
diff --git a/tests/regression/issue_637/other.proto b/tests/regression/issue_637/other.proto
new file mode 100644
index 0000000..d4f72ef
--- /dev/null
+++ b/tests/regression/issue_637/other.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+message SecondOneof {
+    repeated int32 foo = 1;
+}
+
diff --git a/tests/regression/issue_637/test.c b/tests/regression/issue_637/test.c
new file mode 100644
index 0000000..6a2d354
--- /dev/null
+++ b/tests/regression/issue_637/test.c
@@ -0,0 +1,5 @@
+/* This fakes the situation where other.proto is not found for some reason
+ * by making its size indefinite, but then defining it here manually. */
+
+#define SecondOneof_size 5
+#include "oneof.pb.h"