diff --git a/src/plugin/metar/PressureChangeMessage.cpp b/src/plugin/metar/PressureChangeMessage.cpp index 7250c2d95..4ec9a69c4 100644 --- a/src/plugin/metar/PressureChangeMessage.cpp +++ b/src/plugin/metar/PressureChangeMessage.cpp @@ -21,8 +21,8 @@ namespace UKControllerPlugin::Metar { auto PressureChangeMessage::MessageString() const -> std::string { - return "Pressure change at " + airfield + ". QNH was " + this->QnhBefore() + ", now " + this->QnhAfter() + - ". QFE was " + this->QfeBefore() + ", now " + this->QfeAfter() + "."; + return airfield + " QNH(QFE) now " + this->QnhAfter() + "(" + this->QfeAfter() + "), was " + this->QnhBefore() + + "(" + this->QfeBefore() + ")."; } auto PressureChangeMessage::MessageShowHandler() const -> bool diff --git a/test/plugin/metar/PressureChangeMessageTest.cpp b/test/plugin/metar/PressureChangeMessageTest.cpp index b07afe982..ef1438cbf 100644 --- a/test/plugin/metar/PressureChangeMessageTest.cpp +++ b/test/plugin/metar/PressureChangeMessageTest.cpp @@ -66,15 +66,11 @@ namespace UKControllerPluginTest::Metar { TEST_F(PressureChangeMessageTest, ItHasAMessageHectopascals) { - EXPECT_EQ( - "Pressure change at EGKK. QNH was 1013, now 1014. QFE was 1011, now 1012.", - messageHectopascals.MessageString()); + EXPECT_EQ("EGKK QNH(QFE) now 1014(1012), was 1013(1011).", messageHectopascals.MessageString()); } TEST_F(PressureChangeMessageTest, ItHasAMessageInHg) { - EXPECT_EQ( - "Pressure change at EGLL. QNH was 29.92, now 29.94. QFE was 29.84, now 29.86.", - messageInhg.MessageString()); + EXPECT_EQ("EGLL QNH(QFE) now 29.94(29.86), was 29.92(29.84).", messageInhg.MessageString()); } } // namespace UKControllerPluginTest::Metar diff --git a/test/plugin/metar/PressureMonitorTest.cpp b/test/plugin/metar/PressureMonitorTest.cpp index 6e60f5f05..f93da4ffd 100644 --- a/test/plugin/metar/PressureMonitorTest.cpp +++ b/test/plugin/metar/PressureMonitorTest.cpp @@ -108,9 +108,7 @@ namespace UKControllerPluginTest::Metar { TEST_F(PressureMonitorTest, ItSendsUpdateMessageOnNewQnh) { EXPECT_CALL( - this->mockPlugin, - ChatAreaMessage( - _, _, "Pressure change at EGKK. QNH was 1011, now 1012. QFE was 1012, now 1013.", _, _, _, _, _)) + this->mockPlugin, ChatAreaMessage(_, _, "EGKK QNH(QFE) now 1012(1013), was 1011(1012).", _, _, _, _, _)) .Times(1); this->monitor.SetNotficationsEnabled(true);