Improved testing, including checking gotoc's FileDescriptorSet output…

… against protoc.
dsymonds · Mar 26, 2016 · 37e69c0 · 37e69c0
1 parent 29da0d8
commit 37e69c0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,5 @@
-*.6
 .*.swp
 .DS_Store
-6.out
 _testmain.go
 gotoc
 testdata/*.actual

diff --git a/Makefile b/Makefile
@@ -8,6 +8,7 @@ minidiff:
 	mv testdata/mini.pb.go testdata/mini-gotoc.pb.go
 	protoc --go_out=. testdata/mini.proto
 	mv testdata/mini.pb.go testdata/mini-protoc.pb.go
+	sed -i '' '/^var fileDescriptor/,/^}$$/d' testdata/mini-{gotoc,protoc}.pb.go
 	diff -ud testdata/mini-{gotoc,protoc}.pb.go || true
 
 regtest:

diff --git a/testdata/.gitignore b/testdata/.gitignore
@@ -0,0 +1,2 @@
+*.baseline
+_baseline.raw
diff --git a/testdata/1.proto b/testdata/1.proto
@@ -1,5 +1,7 @@
 // Just the basics
 
+syntax = "proto2";
+
 message A {
   required int32 a = 1;
   optional string b = 2;

diff --git a/testdata/2.proto b/testdata/2.proto
@@ -1,5 +1,7 @@
 // Nested message, plus some message references.
 
+syntax = "proto2";
+
 message A {
   message B {
   }

diff --git a/testdata/3.proto b/testdata/3.proto
@@ -1,5 +1,7 @@
 // Default values.
 
+syntax = "proto2";
+
 message A {
   optional int32 int = 1 [default=7];
   optional bool boolean = 2 [default=true];

diff --git a/testdata/4.proto b/testdata/4.proto
@@ -1,5 +1,7 @@
 // Group.
 
+syntax = "proto2";
+
 message A {
   optional group B = 1 {
     required string x = 2;

diff --git a/testdata/run.sh b/testdata/run.sh
@@ -5,6 +5,7 @@ cd $(dirname $0)
 MAX=100
 GOTOC=../gotoc
 PROTOCMP=./protocmp
+PROTOBUF=$HOME/src/protobuf
 
 go build -o protocmp protocmp.go
 
@@ -19,6 +20,14 @@ for ((i=1; $i <= $MAX; i=$((i+1)))); do
     echo "==> FAILED" 1>&2
     failures=$(($failures + 1))
   }
+
+  protoc --descriptor_set_out=_baseline.raw $i.proto
+  protoc --decode=google.protobuf.FileDescriptorSet -I $PROTOBUF $PROTOBUF/src/google/protobuf/descriptor.proto \
+    < _baseline.raw > $i.baseline
+  $PROTOCMP $i.expected $i.baseline || {
+    echo "==> BASELINE MISMATCH" 1>&2
+    failures=$(($failures + 1))
+  }
 done
 
 echo "----------" 1>&2