Merge pull request aeron-io#750 from billsegall/golang-fixes

[Golang] fixes for updated example

Author: mjpt777

build.gradle

@@ -632,7 +632,6 @@ task generateGolangCodecsWithXSD(type: JavaExec) {
  'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
  'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
  'gocode/resources/example-composite.xml',
- 'gocode/resources/example-extension-2-schema.xml',
  'gocode/resources/group-with-data-extension-schema.xml',
  'gocode/resources/simple.xml']
 }

gocode/Makefile

@@ -59,7 +59,7 @@ src/baseline/SbeMarshalling.go: $(DEP)
 # they geenrate into the same directory but golang doesn't allow that
 test: $(DEP)
 (export GOPATH=$(GOPATH) && \
-(for t in baseline extension extension2; do \
+(for t in baseline extension; do \
 export GOPATH=$(GOPATH) && \
  cd $(GOPATH)/src/$$t && \
 go build && \

gocode/resources/example-extension-2-schema.xml

@@ -45,7 +45,7 @@ func TestEncodeDecodeCar(t *testing.T) {
 pf = append(pf, CarPerformanceFigures{95, acc1})
 pf = append(pf, CarPerformanceFigures{99, acc2})
 
-in := Car{1234, 2013, BooleanType.T, Model.A, [5]uint32{0, 1, 2, 3, 4}, vehicleCode, optionalExtras, Model.A, engine, fuel, pf, manufacturer, model, activationCode}
+in := Car{1234, 2013, BooleanType.T, Model.A, [4]uint32{0, 1, 2, 3}, vehicleCode, optionalExtras, Model.A, engine, fuel, pf, manufacturer, model, activationCode}
 
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf, true); err != nil {
@@ -112,10 +112,8 @@ func TestEncodeDecodeCar(t *testing.T) {
 }
 
 func TestDecodeJavaBuffer(t *testing.T) {
-
-// The byte array is from the java example for interop test made by
-// running with -Dsbe.encoding.filename and then decoded using od -tu1
-data := []byte{49, 0, 1, 0, 1, 0, 0, 0, 210, 4, 0, 0, 0, 0, 0, 0, 221, 7, 1, 65, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0, 97, 98, 99, 100, 101, 102, 6, 208, 7, 4, 49, 50, 51, 35, 1, 78, 200, 6, 0, 3, 0, 30, 0, 154, 153, 15, 66, 11, 0, 0, 0, 85, 114, 98, 97, 110, 32, 67, 121, 99, 108, 101, 55, 0, 0, 0, 68, 66, 14, 0, 0, 0, 67, 111, 109, 98, 105, 110, 101, 100, 32, 67, 121, 99, 108, 101, 75, 0, 0, 0, 32, 66, 13, 0, 0, 0, 72, 105, 103, 104, 119, 97, 121, 32, 67, 121, 99, 108, 101, 1, 0, 2, 0, 95, 6, 0, 3, 0, 30, 0, 0, 0, 128, 64, 60, 0, 0, 0, 240, 64, 100, 0, 51, 51, 67, 65, 99, 6, 0, 3, 0, 30, 0, 51, 51, 115, 64, 60, 0, 51, 51, 227, 64, 100, 0, 205, 204, 60, 65, 5, 0, 0, 0, 72, 111, 110, 100, 97, 9, 0, 0, 0, 67, 105, 118, 105, 99, 32, 86, 84, 105, 6, 0, 0, 0, 97, 98, 99, 100, 101, 102}
+// See ~gocode/src/example-schema/CarExample.go for how this is generated
+data := []byte{45, 0, 1, 0, 1, 0, 0, 0, 210, 4, 0, 0, 0, 0, 0, 0, 221, 7, 1, 65, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0, 97, 98, 99, 100, 101, 102, 6, 208, 7, 4, 49, 50, 51, 35, 1, 78, 200, 6, 0, 3, 0, 30, 0, 154, 153, 15, 66, 11, 0, 0, 0, 85, 114, 98, 97, 110, 32, 67, 121, 99, 108, 101, 55, 0, 0, 0, 68, 66, 14, 0, 0, 0, 67, 111, 109, 98, 105, 110, 101, 100, 32, 67, 121, 99, 108, 101, 75, 0, 0, 0, 32, 66, 13, 0, 0, 0, 72, 105, 103, 104, 119, 97, 121, 32, 67, 121, 99, 108, 101, 1, 0, 2, 0, 95, 6, 0, 3, 0, 30, 0, 0, 0, 128, 64, 60, 0, 0, 0, 240, 64, 100, 0, 51, 51, 67, 65, 99, 6, 0, 3, 0, 30, 0, 51, 51, 115, 64, 60, 0, 51, 51, 227, 64, 100, 0, 205, 204, 60, 65, 5, 0, 0, 0, 72, 111, 110, 100, 97, 9, 0, 0, 0, 67, 105, 118, 105, 99, 32, 86, 84, 105, 6, 0, 0, 0, 97, 98, 99, 100, 101, 102}
 
 buf := bytes.NewBuffer(data)
 m := NewSbeGoMarshaller()