Skip to content

Commit

Permalink
chore: update amp-embedded-infra-lib (#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
richardapeters authored Oct 9, 2024
1 parent ad1aeed commit 4fc246d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (PREVIEW_STANDALONE)
FetchContent_Declare(
emil
GIT_REPOSITORY https://github.com/philips-software/amp-embedded-infra-lib
GIT_TAG 7573a8236a494a5893977c107585456a3b481eef # unreleased
GIT_TAG 798ec3da653f955a1eb218279fa93f52f15fcfbf # unreleased
)

FetchContent_MakeAvailable(emil)
Expand All @@ -30,7 +30,7 @@ if (PREVIEW_STANDALONE)
FetchContent_Declare(
halst
GIT_REPOSITORY https://github.com/philips-software/amp-hal-st
GIT_TAG a830ed6a47fc56236ed3a3d54ece794e027c64ed # unreleased
GIT_TAG 5f2a467b1ebc215251219d6457023ffa307d5042 # unreleased
)

FetchContent_MakeAvailable(halst)
Expand Down
6 changes: 3 additions & 3 deletions preview/touch/test/TestTouchScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ TEST_F(TouchScreenTest, Measure_results_in_touch_measurement)

TEST_F(TouchScreenTest, on_no_touch_none_is_reported)
{
infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::none);
infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::none);
onResult = expectOnResult;

xTouchResult = services::TouchScreen::PixelPosition{ 400 };
Expand Down Expand Up @@ -177,7 +177,7 @@ TEST_F(TouchScreenTest, after_measurement_is_done_y_measurement_starts)

TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
{
infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point()));
infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point()));
onResult = expectOnResult;

DoTouchMeasurement();
Expand All @@ -190,7 +190,7 @@ TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)

TEST_F(TouchScreenTest, on_touch_position_is_reported)
{
infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point(42, 134)));
infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point(42, 134)));
onResult = expectOnResult;

xResult = services::TouchScreen::PixelPosition{ 42 };
Expand Down

0 comments on commit 4fc246d

Please sign in to comment.