Fix naming of enums when long_names=false.

Modify test case to check that options.pb.o compiles.

Update issue 42
Status: FixedInGit

Update issue 43
Status: FixedInGit

3 files changed, 8 insertions, 2 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 99e27ff..1f2be71 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -82,7 +82,7 @@ run_unittests: decode_unittests encode_unittests test_cxxcompile test_encode1 te
 	
 	./test_missing_fields
 
-test_options: options.pb.h options.expected
+test_options: options.pb.h options.expected options.pb.o
 	cat options.expected | while read -r p; do \
 	    if ! grep -q "$$p" $<; then \
 	        echo Expected: "$$p"; \
diff --git a/tests/options.expected b/tests/options.expected
index 960daee..61d9805 100644
--- a/tests/options.expected
+++ b/tests/options.expected
@@ -2,4 +2,4 @@ char filesize\[20\];
 char msgsize\[30\];
 char fieldsize\[40\];
 pb_callback_t int32_callback;
-[^_]EnumValue1 = 1
+\sEnumValue1 = 1
diff --git a/tests/options.proto b/tests/options.proto
index e296bcd..7eb2eb3 100644
--- a/tests/options.proto
+++ b/tests/options.proto
@@ -36,4 +36,10 @@ enum Enum1
 {
     option (nanopb_enumopt).long_names = false;
     EnumValue1 = 1;
+    EnumValue2 = 2;
+}
+
+message EnumTest
+{
+    required Enum1 field = 1 [default = EnumValue2];
 }