fixed aeron-io#187 by adding computed offset to BEGIN_GROUP IR nodes

Author: Todd L. Montgomery

main/java/uk/co/real_logic/sbe/xml/IrGenerator.java

@@ -114,6 +114,7 @@ private void addFieldSignal(final Field field, final Signal signal)
  .size(field.computedBlockLength())
  .name(field.name())
  .id(field.id())
+ .offset(field.computedOffset())
  .version(field.sinceVersion())
  .encoding(new Encoding.Builder()
  .epoch(field.epoch())

test/cpp/MessageBlockLengthTest.cpp

@@ -190,13 +190,13 @@ class MessageBlockLengthIrTest : public testing::Test, public IrCollection, publ
 
  virtual int onCompleted()
  {
- EXPECT_EQ(eventNumber_, 9);
+ EXPECT_EQ(eventNumber_, 11);
  return 0;
  }
 
 };
 
-TEST_F(MessageBlockLengthIrTest, DISABLED_shouldHandleAllEventsCorrectltInOrder)
+TEST_F(MessageBlockLengthIrTest, shouldHandleAllEventsCorrectltInOrder)
 {
 
  int sz = encodeHdrAndMsg();
@@ -210,7 +210,7 @@ TEST_F(MessageBlockLengthIrTest, DISABLED_shouldHandleAllEventsCorrectltInOrder)
  EXPECT_EQ(*((::uint64_t *)(buffer + 8)), 187); // field 1
  EXPECT_EQ(*((::uint8_t *)(buffer + 16)), 0x2); // field 2
 
- EXPECT_EQ(*((::uint16_t *)(buffer + 19)), 32); // groupSizeEncoding blockLength
+ EXPECT_EQ(*((::uint16_t *)(buffer + 19)), 16); // groupSizeEncoding blockLength
  EXPECT_EQ(*((::uint8_t *)(buffer + 21)), 2); // groupSizeEncoding numInGroup
 
  ASSERT_GE(IrCollection::loadFromFile("target/test/cpp/message-block-length-test.sbeir"), 0);

test/resources/message-block-length-test.xml

@@ -29,7 +29,7 @@
  <message name="msgName" id="10" blockLength="11" semanticType="M">
 	<field name="field1" id="11" type="uint64" offset="0" semanticType="UTCTimestamp"/>
 	<field name="field2" id="12" type="event" offset="8" semanticType="MultipleCharValue"/>
- <group name="grName" id="20" blocklength="32" dimensionType="groupSizeEncoding">
+ <group name="grName" id="20" dimensionType="groupSizeEncoding">
  <field name="grField1" id="21" type="uint64" semanticType="int"/>
  <field name="grField2" id="22" type="int64" semanticType="int"/>
  </group>