Merge pull request #444 from MarketFactory/test-code

Restructure some test cases so thay can be shared

Author: mjpt777

.gitignore

@@ -72,6 +72,8 @@ gocode/src/composite/*.go
 !gocode/src/composite/*_test.go
 gocode/src/composite_elements/*.go
 !gocode/src/composite_elements/*_test.go
+gocode/src/since-deprecated/*.go
+!gocode/src/since-deprecated/*_test.go
 gocode/src/group_with_data*/*.go
 !gocode/src/group_with_data*/*_test.go
 gocode/src/mktdata/*.go

build.gradle

@@ -498,12 +498,13 @@ task(generateGolangCodecsWithXSD, type:JavaExec) {
         'sbe.validation.xsd': validationXsdPath)
     args = [ 'sbe-tool/src/test/resources/group-with-data-schema.xml',
              'sbe-tool/src/test/resources/FixBinary.xml',
+             'sbe-tool/src/test/resources/issue435.xml',
+             'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
              'gocode/resources/example-bigendian.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/resources/issue435.xml',
              'sbe-samples/src/main/resources/example-schema.xml',
              'sbe-samples/src/main/resources/example-extension-schema.xml' ]
 }
@@ -567,4 +568,4 @@ task uploadToMavenCentral {
 task wrapper(type: Wrapper) {
     gradleVersion = '3.4.1'
     distributionType = 'ALL'
-}
+}

gocode/Makefile

@@ -68,7 +68,7 @@ test: $(DEP)
 		go install \
 		;done))
 	(export GOPATH=$(GOPATH) && \
-		(for t in mktdata group_with_data group_with_data_extension composite_elements composite simple issue435; do \
+		(for t in mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435; do \
 		cd $(GOPATH)/src/$$t && \
 		go build && \
 		go fmt && \

gocode/src/since-deprecated/SinceDeprecated_test.go

@@ -0,0 +1,23 @@
+package since_deprecated
+
+import (
+	"testing"
+)
+
+func TestSinceDeprecated(t *testing.T) {
+
+	sv := SinceDeprecated{1, 2, 3}
+
+	// V1 has always been there
+	if sv.V1SinceVersion() != 0 && sv.V1Deprecated() != 0 {
+		t.Fail()
+	}
+	// V2 was introduced in version 2
+	if sv.V2SinceVersion() != 2 && sv.V1Deprecated() != 0 {
+		t.Fail()
+	}
+	// V3 was introduced in version 3 and deprecated in version 4
+	if sv.V3SinceVersion() != 3 && sv.V3Deprecated() != 4 {
+		t.Fail()
+	}
+}

gocode/resources/issue435.xml renamed to sbe-tool/src/test/resources/issue435.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<sbe:messageSchema xmlns:sbe="http://fixprotocol.io/2016/sbe"
+                   package="since-deprecated"
+                   id="108"
+                   version="4"
+                   semanticVersion="5.2"
+                   description="Test case for SincVersion/DeprecatedVersion"
+                   byteOrder="littleEndian">
+    <types>
+        <composite name="messageHeader" description="Message identifiers and length of message root">
+            <type name="blockLength" primitiveType="uint8"/>
+            <type name="templateId" primitiveType="uint16"/>
+            <type name="schemaId" primitiveType="uint16"/>
+            <type name="version" primitiveType="uint16"/>
+        </composite>
+    </types>
+    <sbe:message name="SinceDeprecated" id="1" semanticType="n/a" description="Since/Deprecated version testing" >
+        <!-- Version 1 was initial with just field v1
+             Version 2 added field v2
+             Version 3 added field v3
+             Version 4 deprecated field v3
+        -->
+        <field name="v1"     id="1"  type="uint64" />
+        <field name="v2"     id="2"  type="uint64" sinceVersion="2"/>
+        <field name="v3"     id="3"  type="uint64" sinceVersion="3" deprecated="4"/>
+    </sbe:message>
+</sbe:messageSchema>