Merge remote-tracking branch 'origin/master'

Author: mjpt777

sbe-tool/src/test/cpp/CMakeLists.txt

@@ -38,6 +38,7 @@ set(COMPOSITE_OFFSETS_SCHEMA ${CODEC_SCHEMA_DIR}/composite-offsets-schema.xml)
 set(MESSAGE_BLOCK_LENGTH_TEST ${CODEC_SCHEMA_DIR}/message-block-length-test.xml)
 set(GROUP_WITH_DATA_SCHEMA ${CODEC_SCHEMA_DIR}/group-with-data-schema.xml)
 set(COMPOSITE_ELEMENTS_SCHEMA ${CODEC_SCHEMA_DIR}/composite-elements-schema.xml)
+set(ISSUE835_SCHEMA ${CODEC_SCHEMA_DIR}/issue835.xml)
 
 set(GENERATED_CODECS
  ${CXX_CODEC_TARGET_DIR}
@@ -58,6 +59,7 @@ add_custom_command(
  ${MESSAGE_BLOCK_LENGTH_TEST}
  ${GROUP_WITH_DATA_SCHEMA}
  ${COMPOSITE_ELEMENTS_SCHEMA}
+ ${ISSUE835_SCHEMA}
 )
 
 add_custom_target(codecs DEPENDS ${GENERATED_CODECS})
@@ -71,3 +73,4 @@ sbe_test(MessageBlockLengthTest codecs)
 sbe_test(GroupWithDataTest codecs)
 sbe_test(Rc3OtfFullIrTest codecs)
 sbe_test(CompositeElementsTest codecs)
+sbe_test(Issue835Test codecs)

sbe-tool/src/test/cpp/GroupWithDataTest.cpp

@@ -21,7 +21,6 @@
 #include "group_with_data/TestMessage3.h"
 #include "group_with_data/TestMessage4.h"
 
-// using namespace std;
 using namespace group::with::data;
 
 static const std::uint32_t TAG_1 = 32;

sbe-tool/src/test/cpp/Issue835Test.cpp

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013-2021 Real Logic Limited.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gtest/gtest.h"
+#include "simple/MDUpdateAction.h"
+#include "simple/MDEntryTypeBook.h"
+#include "simple/MDIncrementalRefreshOrderBook47.h"
+
+static const std::size_t BUFFER_LEN = 2048u;
+
+using namespace simple;
+
+class Issue835Test : public testing::Test
+{
+};
+
+TEST_F(Issue835Test, shouldCompileWithSkipper)
+{
+ const std::uint64_t timeNs = 777;
+ const std::size_t offset = 0;
+ char buffer[BUFFER_LEN] = {};
+ MDIncrementalRefreshOrderBook47 encoder = {};
+
+ encoder
+ .wrapForEncode(buffer, offset, BUFFER_LEN)
+ .transactTime(timeNs)
+ .matchEventIndicator()
+ .lastQuoteMsg(true)
+ .recoveryMsg(false)
+ .reserved(true);
+
+ MDIncrementalRefreshOrderBook47::NoMDEntries &entries = encoder.noMDEntriesCount(2);
+
+ entries.next();
+ entries.orderID(1);
+ entries.mDOrderPriority(2);
+ entries.mDEntryPx().mantissa(77);
+ entries.securityID(33);
+ entries.mDUpdateAction(MDUpdateAction::Value::New);
+ entries.mDEntryType(MDEntryTypeBook::Value::Bid);
+
+ entries.next();
+ entries.orderID(2);
+ entries.mDOrderPriority(3);
+ entries.mDEntryPx().mantissa(88);
+ entries.securityID(44);
+ entries.mDUpdateAction(MDUpdateAction::Value::New);
+ entries.mDEntryType(MDEntryTypeBook::Value::Offer);
+
+ MDIncrementalRefreshOrderBook47 decoder = {};
+ decoder.wrapForDecode(
+ buffer,
+ offset,
+ MDIncrementalRefreshOrderBook47::sbeBlockLength(),
+ MDIncrementalRefreshOrderBook47::sbeSchemaVersion(),
+ BUFFER_LEN);
+
+ EXPECT_EQ(decoder.decodeLength(), encoder.encodedLength());
+}