Skip to content

Commit 46328f7

Browse files
vyazelenkovyazelenko
committed
[Java] Update the test to use shorter suffix and mixed case characters.
1 parent 552b447 commit 46328f7

File tree

3 files changed

+61
-57
lines changed

3 files changed

+61
-57
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ project(':sbe-tool') {
355355
'sbe.validation.xsd': validationXsdPath,
356356
'sbe.generate.precedence.checks': 'true',
357357
'sbe.java.precedence.checks.property.name': 'sbe.enable.test.precedence.checks',
358-
'sbe.keyword.append.token': 'KeywordSuffix',
358+
'sbe.keyword.append.token': '$',
359359
'sbe.java.generate.dtos': 'true')
360360
args = ['src/test/resources/example-extension-schema.xml', 'src/test/resources/dto-test-schema.xml']
361361
}

‎sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/DtoTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ void shouldRoundTripCar2()
7777
void dtoWithKeywords()
7878
{
7979
final KeywordsDto dto = new KeywordsDto();
80-
dto.assertKeywordSuffix((short)42);
81-
dto.finalKeywordSuffix((short)7);
80+
dto.assert$((byte)42);
81+
dto.final$((byte)7);
82+
dto.abstract$((byte)-81);
83+
dto.false$((byte)0);
84+
dto.falsE((byte)1);
8285
final ExpandableArrayBuffer input = new ExpandableArrayBuffer();
8386
final KeywordsEncoder encoder = new KeywordsEncoder();
8487
encoder.wrap(input, 0);

‎sbe-tool/src/test/resources/dto-test-schema.xml

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -109,59 +109,60 @@
109109
</sbe:message>
110110

111111
<sbe:message name="Keywords" id="3">
112-
<field name="abstract" id="1" type="uint8"/>
113-
<field name="assert" id="2" type="uint8"/>
114-
<field name="boolean" id="3" type="uint8"/>
115-
<field name="break" id="4" type="uint8"/>
116-
<field name="byte" id="5" type="uint8"/>
117-
<field name="case" id="6" type="uint8"/>
118-
<field name="catch" id="7" type="uint8"/>
119-
<field name="char" id="8" type="uint8"/>
120-
<field name="class" id="9" type="uint8"/>
121-
<field name="const" id="10" type="uint8"/>
122-
<field name="continue" id="11" type="uint8"/>
123-
<field name="default" id="12" type="uint8"/>
124-
<field name="do" id="13" type="uint8"/>
125-
<field name="double" id="14" type="uint8"/>
126-
<field name="else" id="15" type="uint8"/>
127-
<field name="enum" id="16" type="uint8"/>
128-
<field name="extends" id="17" type="uint8"/>
129-
<field name="final" id="18" type="uint8"/>
130-
<field name="finally" id="19" type="uint8"/>
131-
<field name="float" id="20" type="uint8"/>
132-
<field name="for" id="21" type="uint8"/>
133-
<field name="goto" id="22" type="uint8"/>
134-
<field name="if" id="23" type="uint8"/>
135-
<field name="implements" id="24" type="uint8"/>
136-
<field name="import" id="25" type="uint8"/>
137-
<field name="instanceof" id="26" type="uint8"/>
138-
<field name="int" id="27" type="uint8"/>
139-
<field name="interface" id="28" type="uint8"/>
140-
<field name="long" id="29" type="uint8"/>
141-
<field name="native" id="30" type="uint8"/>
142-
<field name="new" id="31" type="uint8"/>
143-
<field name="package" id="32" type="uint8"/>
144-
<field name="private" id="33" type="uint8"/>
145-
<field name="protected" id="34" type="uint8"/>
146-
<field name="public" id="35" type="uint8"/>
147-
<field name="return" id="36" type="uint8"/>
148-
<field name="short" id="37" type="uint8"/>
149-
<field name="static" id="38" type="uint8"/>
150-
<field name="strictfp" id="39" type="uint8"/>
151-
<field name="super" id="40" type="uint8"/>
152-
<field name="switch" id="41" type="uint8"/>
153-
<field name="synchronized" id="42" type="uint8"/>
154-
<field name="this" id="43" type="uint8"/>
155-
<field name="throw" id="44" type="uint8"/>
156-
<field name="throws" id="45" type="uint8"/>
157-
<field name="transient" id="46" type="uint8"/>
158-
<field name="try" id="47" type="uint8"/>
159-
<field name="void" id="48" type="uint8"/>
160-
<field name="volatile" id="49" type="uint8"/>
161-
<field name="while" id="50" type="uint8"/>
162-
<field name="null" id="51" type="uint8"/>
163-
<field name="true" id="52" type="uint8"/>
164-
<field name="false" id="53" type="uint8"/>
165-
<field name="_" id="54" type="uint8"/>
112+
<field name="Abstract" id="1" type="int8"/>
113+
<field name="assert" id="2" type="int8"/>
114+
<field name="boolean" id="3" type="int8"/>
115+
<field name="break" id="4" type="int8"/>
116+
<field name="byte" id="5" type="int8"/>
117+
<field name="case" id="6" type="int8"/>
118+
<field name="catch" id="7" type="int8"/>
119+
<field name="char" id="8" type="int8"/>
120+
<field name="class" id="9" type="int8"/>
121+
<field name="const" id="10" type="int8"/>
122+
<field name="continue" id="11" type="int8"/>
123+
<field name="default" id="12" type="int8"/>
124+
<field name="do" id="13" type="int8"/>
125+
<field name="double" id="14" type="int8"/>
126+
<field name="else" id="15" type="int8"/>
127+
<field name="enum" id="16" type="int8"/>
128+
<field name="extends" id="17" type="int8"/>
129+
<field name="final" id="18" type="int8"/>
130+
<field name="finally" id="19" type="int8"/>
131+
<field name="float" id="20" type="int8"/>
132+
<field name="for" id="21" type="int8"/>
133+
<field name="goto" id="22" type="int8"/>
134+
<field name="if" id="23" type="int8"/>
135+
<field name="implements" id="24" type="int8"/>
136+
<field name="import" id="25" type="int8"/>
137+
<field name="instanceof" id="26" type="int8"/>
138+
<field name="int" id="27" type="int8"/>
139+
<field name="interface" id="28" type="int8"/>
140+
<field name="long" id="29" type="int8"/>
141+
<field name="native" id="30" type="int8"/>
142+
<field name="new" id="31" type="int8"/>
143+
<field name="package" id="32" type="int8"/>
144+
<field name="private" id="33" type="int8"/>
145+
<field name="protected" id="34" type="int8"/>
146+
<field name="public" id="35" type="int8"/>
147+
<field name="return" id="36" type="int8"/>
148+
<field name="short" id="37" type="int8"/>
149+
<field name="static" id="38" type="int8"/>
150+
<field name="strictfp" id="39" type="int8"/>
151+
<field name="super" id="40" type="int8"/>
152+
<field name="switch" id="41" type="int8"/>
153+
<field name="synchronized" id="42" type="int8"/>
154+
<field name="this" id="43" type="int8"/>
155+
<field name="throw" id="44" type="int8"/>
156+
<field name="throws" id="45" type="int8"/>
157+
<field name="transient" id="46" type="int8"/>
158+
<field name="try" id="47" type="int8"/>
159+
<field name="void" id="48" type="int8"/>
160+
<field name="volatile" id="49" type="int8"/>
161+
<field name="while" id="50" type="int8"/>
162+
<field name="null" id="51" type="int8"/>
163+
<field name="true" id="52" type="int8"/>
164+
<field name="false" id="53" type="int8"/>
165+
<field name="_" id="54" type="int8"/>
166+
<field name="falsE" id="55" type="int8"/>
166167
</sbe:message>
167168
</sbe:messageSchema>

0 commit comments

Comments
 (0)