Skip to content

Commit fe7dc37

Browse files
VDanielEdwardsVDanielEdwards
authored
ci: fix MSVC 14.2 and docs build (#224)
1 parent b4a9128 commit fe7dc37

23 files changed

Lines changed: 213 additions & 211 deletions

‎SilKit/IntegrationTests/ITest_CanDemo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ TEST_F(ITest_CanDemo, can_demo)
324324
EXPECT_EQ(frame.frame.sdt, 1);
325325
EXPECT_EQ(frame.frame.af, 0xdeadbeef);
326326
EXPECT_EQ(frame.frame.vcid, 234);
327-
EXPECT_EQ(frame.frame.dataField.size(), 2048);
327+
EXPECT_EQ(frame.frame.dataField.size(), 2048u);
328328
EXPECT_TRUE(frame.frame.flags & SilKit_CanFrameFlag_xlf);
329329
EXPECT_TRUE(frame.frame.flags & SilKit_CanFrameFlag_fdf);
330330
}

‎SilKit/IntegrationTests/ITest_Dashboard.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void CheckTestResult(SilKit::Dashboard::TestResult actual, SilKit::Dashboard::Te
273273
for (auto i = expected.dataBySimulation.begin(); i != expected.dataBySimulation.end(); ++i)
274274
{
275275
auto simulationId = i->first;
276-
ASSERT_EQ(actual.dataBySimulation.count(simulationId), 1) << "Simulation Ids differ!";
276+
ASSERT_EQ(actual.dataBySimulation.count(simulationId), 1u) << "Simulation Ids differ!";
277277
CheckSimulationData(actual.dataBySimulation[simulationId], i->second, simulationId);
278278
}
279279
}

‎SilKit/IntegrationTests/ITest_LabelsMatching.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ TEST_F(ITest_LabelMatching, pubsub_multiple_controllers_same_topic_different_la
106106

107107
_simTestHarness->Run(1s);
108108

109-
EXPECT_EQ(numReceivedSubCtrl1, 1);
110-
EXPECT_EQ(numReceivedSubCtrl2, 1);
111-
EXPECT_EQ(numReceivedSubCtrl3, 1);
109+
EXPECT_EQ(numReceivedSubCtrl1, 1u);
110+
EXPECT_EQ(numReceivedSubCtrl2, 1u);
111+
EXPECT_EQ(numReceivedSubCtrl3, 1u);
112112
}
113113

114114
TEST_F(ITest_LabelMatching, rpc_multiple_controllers_same_topic_different_labels)
@@ -190,11 +190,11 @@ TEST_F(ITest_LabelMatching, rpc_multiple_controllers_same_topic_different_labels
190190

191191
_simTestHarness->Run(1s);
192192

193-
EXPECT_EQ(numReceivedCallResults1, 1);
193+
EXPECT_EQ(numReceivedCallResults1, 1u);
194194

195-
EXPECT_EQ(numReceivedCalls1, 1);
196-
EXPECT_EQ(numReceivedCalls2, 0);
197-
EXPECT_EQ(numReceivedCalls3, 0);
195+
EXPECT_EQ(numReceivedCalls1, 1u);
196+
EXPECT_EQ(numReceivedCalls2, 0u);
197+
EXPECT_EQ(numReceivedCalls3, 0u);
198198
}
199199

200200
} //end namespace

‎SilKit/IntegrationTests/ITest_Lin.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,10 +516,10 @@ TEST_F(ITest_Lin, sync_lin_simulation)
516516
auto&& slaveRecvFrames = linNodes.at(1)->_result.receivedFrames;
517517

518518
// 5x acks with TX_OK for id 16,17,18,19,60 on master
519-
EXPECT_EQ(masterRecvFrames[LinFrameStatus::LIN_TX_OK].size(), 5);
519+
EXPECT_EQ(masterRecvFrames[LinFrameStatus::LIN_TX_OK].size(), 5u);
520520

521521
// LIN_RX_OK for Id 16 and GoToSleep-Frame
522-
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_RX_OK].size(), 2);
522+
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_RX_OK].size(), 2u);
523523
// Id 16 is valid for slave and received with LIN_RX_OK and given data
524524
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_RX_OK][0].id, 16);
525525
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_RX_OK][0].data, (std::array<uint8_t, 8>{1, 6, 1, 6, 1, 6, 1, 6}));
@@ -530,12 +530,12 @@ TEST_F(ITest_Lin, sync_lin_simulation)
530530
// id 17: sent with LinFrameResponseMode::Unused and should not trigger the reception callback for slaves
531531
// id 18: LinChecksumModel does not match with master --> Receive with LIN_RX_ERROR
532532
// id 19: dataLength does not match with master --> Receive with LIN_RX_ERROR
533-
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_RX_ERROR].size(), 2);
533+
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_RX_ERROR].size(), 2u);
534534

535535
// id 34: sent by slave (slave should see TX, master should see RX with given data)
536-
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_TX_OK].size(), 1);
536+
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_TX_OK].size(), 1u);
537537
EXPECT_EQ(slaveRecvFrames[LinFrameStatus::LIN_TX_OK][0].id, 34);
538-
EXPECT_EQ(masterRecvFrames[LinFrameStatus::LIN_RX_OK].size(), 1);
538+
EXPECT_EQ(masterRecvFrames[LinFrameStatus::LIN_RX_OK].size(), 1u);
539539
EXPECT_EQ(masterRecvFrames[LinFrameStatus::LIN_RX_OK][0].id, 34);
540540
EXPECT_EQ(masterRecvFrames[LinFrameStatus::LIN_RX_OK][0].data, (std::array<uint8_t, 8>{3, 4, 3, 4, 3, 4, 3, 4}));
541541
}

‎SilKit/IntegrationTests/ITest_LinDemo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ TEST_F(ITest_LinDemo, DISABLED_lin_demo)
509509
{
510510
if (node->_name == "LinSlave")
511511
{
512-
EXPECT_EQ(node->_result.numberReceivedInSleep, 0);
512+
EXPECT_EQ(node->_result.numberReceivedInSleep, 0u);
513513
EXPECT_EQ(node->_result.numberReceived, node->_controllerConfig.frameResponses.size());
514514
EXPECT_TRUE(node->_result.gotoSleepReceived)
515515
<< "Assuming node " << node->_name << " has received a GoToSleep";

‎SilKit/IntegrationTests/ITest_LinDynamicResponse.cpp‎

Lines changed: 37 additions & 37 deletions
Large diffs are not rendered by default.

‎SilKit/IntegrationTests/ITest_NetSimCan.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ TEST_F(ITest_NetSimCan, basic_networksimulation_can)
263263
EXPECT_EQ(callCounts.silKitHandlersCanSimulated.StateChangeHandler, numSimulatedCanControllers);
264264
EXPECT_EQ(callCounts.silKitHandlersCanTrivial.StateChangeHandler, _numParticipantsTrivial);
265265
EXPECT_EQ(callCounts.silKitHandlersCanSimulated.ErrorStateChangeHandler, numSimulatedCanControllers);
266-
EXPECT_EQ(callCounts.silKitHandlersCanTrivial.ErrorStateChangeHandler, 0);
266+
EXPECT_EQ(callCounts.silKitHandlersCanTrivial.ErrorStateChangeHandler, 0u);
267267

268268
EXPECT_EQ(callCounts.netSimCan.OnFrameRequest, numSentFramesSimulated);
269269
EXPECT_EQ(callCounts.netSimCan.OnSetBaudrate, numSimulatedCanControllers);

‎SilKit/IntegrationTests/ITest_NetSimEthernet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ TEST_F(ITest_NetSimEthernet, basic_networksimulation_ethernet)
254254
EXPECT_EQ(callCounts.silKitHandlersEthernetSimulated.StateChangeHandler, numSimulatedEthernetControllers);
255255
EXPECT_EQ(callCounts.silKitHandlersEthernetTrivial.StateChangeHandler, _numParticipantsTrivial);
256256
EXPECT_EQ(callCounts.silKitHandlersEthernetSimulated.BitrateChangeHandler, numSimulatedEthernetControllers);
257-
EXPECT_EQ(callCounts.silKitHandlersEthernetTrivial.BitrateChangeHandler, 0);
257+
EXPECT_EQ(callCounts.silKitHandlersEthernetTrivial.BitrateChangeHandler, 0u);
258258

259259
EXPECT_EQ(callCounts.netSimEthernet.OnFrameRequest, numSentFramesSimulated);
260260
EXPECT_EQ(callCounts.netSimEthernet.OnSetControllerMode, numSimulatedEthernetControllers);

‎SilKit/IntegrationTests/ITest_NetSimLin.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ TEST_F(ITest_NetSimLin, basic_networksimulation_lin)
421421

422422
// Not dynamic: No Handler triggered
423423
// See: LinController::ReceiveMsg(const IServiceEndpoint* from, const LinSendFrameHeaderRequest& msg)
424-
EXPECT_EQ(callCounts.silKitHandlersLinSimulated.FrameHeaderHandler, 0);
424+
EXPECT_EQ(callCounts.silKitHandlersLinSimulated.FrameHeaderHandler, 0u);
425425
// Trivial: No Handler triggered, but a LinTransmission and thus FrameStatusHandler
426-
EXPECT_EQ(callCounts.silKitHandlersLinTrivial.FrameHeaderHandler, 0);
426+
EXPECT_EQ(callCounts.silKitHandlersLinTrivial.FrameHeaderHandler, 0u);
427427

428428
// - 1 because the handler is not called on the master
429429
EXPECT_EQ(callCounts.silKitHandlersLinSimulated.GoToSleepHandler, numSimulatedLinControllers - 1);
@@ -438,15 +438,15 @@ TEST_F(ITest_NetSimLin, basic_networksimulation_lin)
438438
EXPECT_EQ(callCounts.netSimLin.OnFrameHeaderRequest, numSentFrameHeadersSimulated);
439439

440440
// Oneshot by the masters ILinController::Wakeup
441-
EXPECT_EQ(callCounts.netSimLin.OnWakeupPulse, 1);
441+
EXPECT_EQ(callCounts.netSimLin.OnWakeupPulse, 1u);
442442

443443
EXPECT_EQ(callCounts.netSimLin.OnControllerConfig, numSimulatedLinControllers);
444444

445445
// linController->SendFrame will send a LinFrameResponseUpdate+LinSendFrameRequest
446446
EXPECT_EQ(callCounts.netSimLin.OnFrameResponseUpdate, numSentFramesSimulated);
447447

448448
// Once via ILinController::Wakeup, once via ILinController::GoToSleep
449-
EXPECT_EQ(callCounts.netSimLin.OnControllerStatusUpdate, 2);
449+
EXPECT_EQ(callCounts.netSimLin.OnControllerStatusUpdate, 2u);
450450

451451
EXPECT_EQ(callCounts.silKitSentMsgLin.SentFramesSimulated, numSentFramesSimulated);
452452
EXPECT_EQ(callCounts.silKitSentMsgLin.SentFrameHeadersSimulated, numSentFrameHeadersSimulated);
@@ -594,7 +594,7 @@ TEST_F(ITest_NetSimLin, networksimulation_lin_dynamic)
594594
EXPECT_EQ(callCounts.silKitHandlersLinSimulated.FrameHeaderHandler,
595595
numSentFrameHeadersSimulated * numSimulatedLinControllers);
596596
// Trivial: No Handler triggered, but a LinTransmission and thus FrameStatusHandler
597-
EXPECT_EQ(callCounts.silKitHandlersLinTrivial.FrameHeaderHandler, 0);
597+
EXPECT_EQ(callCounts.silKitHandlersLinTrivial.FrameHeaderHandler, 0u);
598598

599599
// - 1 because the handler is not called on the master
600600
EXPECT_EQ(callCounts.silKitHandlersLinSimulated.GoToSleepHandler, numSimulatedLinControllers - 1);
@@ -604,20 +604,20 @@ TEST_F(ITest_NetSimLin, networksimulation_lin_dynamic)
604604
EXPECT_EQ(callCounts.silKitHandlersLinTrivial.WakeupHandler, numTrivialLinControllers);
605605

606606
// Only the GoToSleepFrame comes in as a FrameRequest in dynamic mode
607-
EXPECT_EQ(callCounts.netSimLin.OnFrameRequest, 1);
607+
EXPECT_EQ(callCounts.netSimLin.OnFrameRequest, 1u);
608608

609609
EXPECT_EQ(callCounts.netSimLin.OnFrameHeaderRequest, numSentFrameHeadersSimulated);
610610

611611
// Oneshot by the masters ILinController::Wakeup
612-
EXPECT_EQ(callCounts.netSimLin.OnWakeupPulse, 1);
612+
EXPECT_EQ(callCounts.netSimLin.OnWakeupPulse, 1u);
613613

614614
EXPECT_EQ(callCounts.netSimLin.OnControllerConfig, numSimulatedLinControllers);
615615

616616
// linController->SendFrameHeader leads to a LinFrameResponseUpdate via SendDynamicResponse
617617
EXPECT_EQ(callCounts.netSimLin.OnFrameResponseUpdate, numSentFrameHeadersSimulated);
618618

619619
// Once via ILinController::Wakeup, once via ILinController::GoToSleep
620-
EXPECT_EQ(callCounts.netSimLin.OnControllerStatusUpdate, 2);
620+
EXPECT_EQ(callCounts.netSimLin.OnControllerStatusUpdate, 2u);
621621

622622
EXPECT_EQ(callCounts.silKitSentMsgLin.SentFramesSimulated, numSentFramesSimulated);
623623
EXPECT_EQ(callCounts.silKitSentMsgLin.SentFrameHeadersSimulated, numSentFrameHeadersSimulated);

‎SilKit/IntegrationTests/ITest_SimTask.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ TEST(ITest_SimTask, blocking_during_simtask_does_not_affect_processing_order)
249249
s->CreateDataSubscriber("Sub", spec,
250250
[&received](SilKit::Services::PubSub::IDataSubscriber *,
251251
const SilKit::Services::PubSub::DataMessageEvent &event) {
252-
ASSERT_EQ(event.data.size(), 8);
252+
ASSERT_EQ(event.data.size(), 8u);
253253
const auto value = Counter::ExtractValue(event.data);
254254
ASSERT_GT(Counter::ExtractMajor(value), uint32_t{0})
255255
<< SilKit::Util::AsHexString(event.data).WithSeparator(":");

0 commit comments

Comments
 (0)