Skip to content

Commit 4dba702

Browse files
committed
Restructure some test cases so thay can be shared
1 parent 5820ce8 commit 4dba702

File tree

6 files changed

+56
-3
lines changed

6 files changed

+56
-3
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ gocode/src/composite/*.go
7272
!gocode/src/composite/*_test.go
7373
gocode/src/composite_elements/*.go
7474
!gocode/src/composite_elements/*_test.go
75+
gocode/src/since-deprecated/*.go
76+
!gocode/src/since-deprecated/*_test.go
7577
gocode/src/group_with_data*/*.go
7678
!gocode/src/group_with_data*/*_test.go
7779
gocode/src/mktdata/*.go

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,12 +498,13 @@ task(generateGolangCodecsWithXSD, type:JavaExec) {
498498
'sbe.validation.xsd': validationXsdPath)
499499
args = [ 'sbe-tool/src/test/resources/group-with-data-schema.xml',
500500
'sbe-tool/src/test/resources/FixBinary.xml',
501+
'sbe-tool/src/test/resources/issue435.xml',
502+
'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
501503
'gocode/resources/example-bigendian.xml',
502504
'gocode/resources/example-composite.xml',
503505
'gocode/resources/example-extension-2-schema.xml',
504506
'gocode/resources/group-with-data-extension-schema.xml',
505507
'gocode/resources/simple.xml',
506-
'gocode/resources/issue435.xml',
507508
'sbe-samples/src/main/resources/example-schema.xml',
508509
'sbe-samples/src/main/resources/example-extension-schema.xml' ]
509510
}
@@ -567,4 +568,4 @@ task uploadToMavenCentral {
567568
task wrapper(type: Wrapper) {
568569
gradleVersion = '3.4.1'
569570
distributionType = 'ALL'
570-
}
571+
}

gocode/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ test: $(DEP)
6868
go install \
6969
;done))
7070
(export GOPATH=$(GOPATH) && \
71-
(for t in mktdata group_with_data group_with_data_extension composite_elements composite simple issue435; do \
71+
(for t in mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435; do \
7272
cd $(GOPATH)/src/$$t && \
7373
go build && \
7474
go fmt && \
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package since_deprecated
2+
3+
import (
4+
"testing"
5+
)
6+
7+
func TestSinceDeprecated(t *testing.T) {
8+
9+
sv := SinceDeprecated{1, 2, 3}
10+
11+
// V1 has always been there
12+
if sv.V1SinceVersion() != 0 && sv.V1Deprecated() != 0 {
13+
t.Fail()
14+
}
15+
// V2 was introduced in version 2
16+
if sv.V2SinceVersion() != 2 && sv.V1Deprecated() != 0 {
17+
t.Fail()
18+
}
19+
// V3 was introduced in version 3 and deprecated in version 4
20+
if sv.V3SinceVersion() != 3 && sv.V3Deprecated() != 4 {
21+
t.Fail()
22+
}
23+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<sbe:messageSchema xmlns:sbe="http://fixprotocol.io/2016/sbe"
3+
package="since-deprecated"
4+
id="108"
5+
version="4"
6+
semanticVersion="5.2"
7+
description="Test case for SincVersion/DeprecatedVersion"
8+
byteOrder="littleEndian">
9+
<types>
10+
<composite name="messageHeader" description="Message identifiers and length of message root">
11+
<type name="blockLength" primitiveType="uint8"/>
12+
<type name="templateId" primitiveType="uint16"/>
13+
<type name="schemaId" primitiveType="uint16"/>
14+
<type name="version" primitiveType="uint16"/>
15+
</composite>
16+
</types>
17+
<sbe:message name="SinceDeprecated" id="1" semanticType="n/a" description="Since/Deprecated version testing" >
18+
<!-- Version 1 was initial with just field v1
19+
Version 2 added field v2
20+
Version 3 added field v3
21+
Version 4 deprecated field v3
22+
-->
23+
<field name="v1" id="1" type="uint64" />
24+
<field name="v2" id="2" type="uint64" sinceVersion="2"/>
25+
<field name="v3" id="3" type="uint64" sinceVersion="3" deprecated="4"/>
26+
</sbe:message>
27+
</sbe:messageSchema>

0 commit comments

Comments
 (0)