[C++]: changed code-generation test schema to use a different string for Booster to catch issues like aeron-io#435. Fixed includes and declarations use correct name.

Author: tmontgomery

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -87,7 +87,7 @@ public List<String> generateTypeStubs() throws IOException
  break;
  }
 
- typesToInclude.add(tokens.get(0).name());
+ typesToInclude.add(tokens.get(0).contextualTypeName());
  }
 
  return typesToInclude;
@@ -104,7 +104,7 @@ public List<String> generateTypesToIncludes(final List<Token> tokens)
  case BEGIN_ENUM:
  case BEGIN_SET:
  case BEGIN_COMPOSITE:
- typesToInclude.add(token.name());
+ typesToInclude.add(token.contextualTypeName());
  break;
  }
  }
@@ -1520,7 +1520,7 @@ private CharSequence generateEnumProperty(
  final Token token,
  final String indent)
  {
- final String enumName = formatClassName(token.name());
+ final String enumName = formatClassName(token.contextualTypeName());
  final String typeName = cppTypeName(token.encoding().primitiveType());
  final int offset = token.offset();
 
@@ -1587,7 +1587,7 @@ private static Object generateBitsetProperty(final String propertyName, final To
  {
  final StringBuilder sb = new StringBuilder();
 
- final String bitsetName = formatClassName(token.name());
+ final String bitsetName = formatClassName(token.contextualTypeName());
  final int offset = token.offset();
 
  sb.append(String.format(
@@ -1623,7 +1623,7 @@ private static Object generateBitsetProperty(final String propertyName, final To
 
  private static Object generateCompositeProperty(final String propertyName, final Token token, final String indent)
  {
- final String compositeName = formatClassName(token.name());
+ final String compositeName = formatClassName(token.contextualTypeName());
  final int offset = token.offset();
 
  final StringBuilder sb = new StringBuilder();

sbe-tool/src/test/resources/code-generation-schema.xml

@@ -27,7 +27,7 @@
  <type name="VehicleCode" primitiveType="char" length="6" characterEncoding="ASCII"/>
  <type name="someNumbers" primitiveType="int32" length="5"/>
  <type name="Ron" primitiveType="uint8" minValue="90" maxValue="110"/>
- <composite name="Booster">
+ <composite name="BoosterT">
  <enum name="BoostType" encodingType="char">
  <validValue name="TURBO">T</validValue>
  <validValue name="SUPERCHARGER">S</validValue>
@@ -42,7 +42,7 @@
  <type name="maxRpm" primitiveType="uint16" presence="constant">9000</type>
  <type name="manufacturerCode" primitiveType="char" length="3"/>
  <type name="fuel" primitiveType="char" presence="constant">Petrol</type>
- <ref name="booster" type="Booster"/>
+ <ref name="booster" type="BoosterT"/>
  </composite>
  <enum name="BooleanType" encodingType="uint8">
  <validValue name="F">0</validValue>