3 files changed, 45 insertions, 0 deletions
diff --git a/tests/enum_to_string/SConscript b/tests/enum_to_string/SConscript
new file mode 100644
index 00000000..e86fcca0
--- /dev/null
+++ b/tests/enum_to_string/SConscript
@@ -0,0 +1,7 @@
+# Test enum to string functionality
+
+Import('env')
+env.NanopbProto("enum.proto")
+p = env.Program(["enum_to_string.c", "enum.pb.c"])
+env.RunTest(p)
+
diff --git a/tests/enum_to_string/enum.proto b/tests/enum_to_string/enum.proto
new file mode 100644
index 00000000..07c67363
--- /dev/null
+++ b/tests/enum_to_string/enum.proto
@@ -0,0 +1,19 @@
+/* Test enum to string function generation */
+
+syntax = "proto2";
+
+import "nanopb.proto";
+
+option (nanopb_fileopt).enum_to_string = true;
+
+enum MyEnum {
+    VALUE1 = 1;
+    VALUE2 = 2;
+    VALUE15 = 15;
+}
+
+enum MyShortNameEnum {
+    option (nanopb_enumopt).long_names = false;
+    MSNE_VALUE256 = 256;
+}
+
diff --git a/tests/enum_to_string/enum_to_string.c b/tests/enum_to_string/enum_to_string.c
new file mode 100644
index 00000000..c4fb31d4
--- /dev/null
+++ b/tests/enum_to_string/enum_to_string.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include "unittests.h"
+#include "enum.pb.h"
+
+int main()
+{
+    int status = 0;
+    TEST(strcmp(MyEnum_name(MyEnum_VALUE1), "VALUE1") == 0);
+    TEST(strcmp(MyEnum_name(MyEnum_VALUE2), "VALUE2") == 0);
+    TEST(strcmp(MyEnum_name(MyEnum_VALUE15), "VALUE15") == 0);
+    TEST(strcmp(MyShortNameEnum_name(MSNE_VALUE256), "MSNE_VALUE256") == 0);
+    TEST(strcmp(MyShortNameEnum_name(9999), "unknown") == 0);
+    
+    if (status != 0)
+        fprintf(stdout, "\n\nSome tests FAILED!\n");
+
+    return status;
+}
+