Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake_install_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build and install
working-directory: ${{github.workspace}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run tests on CMake
name: Run tests on Ubuntu

on:
push:
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/cmake_test_macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Run tests on MacOS

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

env:
BUILD_TYPE: Debug

jobs:
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v4

- name: Configure CMake
working-directory: ${{github.workspace}}/test
run: cmake -B ${{github.workspace}}/test/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
working-directory: ${{github.workspace}}/test
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/test/build --config ${{env.BUILD_TYPE}}

- name: Run tests
working-directory: ${{github.workspace}}/test
run: ./dsm_tests.out
24 changes: 21 additions & 3 deletions test/Test_dynamics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,24 +186,42 @@ TEST_CASE("Dynamics") {
"same as "
"the itinerary") {
CHECK_EQ(dynamics.agents().size(), 3);
CHECK(dynamics.agents().at(0)->streetId().has_value());
CHECK(dynamics.agents().at(1)->streetId().has_value());
CHECK(dynamics.agents().at(2)->streetId().has_value());
#ifdef __APPLE__
CHECK_EQ(dynamics.itineraries()
.at(dynamics.agents().at(0)->itineraryId())
->destination(),
Itinerary2.destination());
CHECK_EQ(dynamics.agents().at(0)->streetId().value(), 6);
CHECK_EQ(dynamics.itineraries()
.at(dynamics.agents().at(1)->itineraryId())
->destination(),
Itinerary1.destination());
CHECK_EQ(dynamics.agents().at(1)->streetId().value(), 1);
CHECK_EQ(dynamics.itineraries()
.at(dynamics.agents().at(2)->itineraryId())
->destination(),
Itinerary1.destination());
CHECK_EQ(dynamics.agents().at(2)->streetId().value(), 8);
#else
CHECK_EQ(dynamics.itineraries()
.at(dynamics.agents().at(0)->itineraryId())
->destination(),
Itinerary1.destination());
CHECK(dynamics.agents().at(0)->streetId().has_value());
CHECK_EQ(dynamics.agents().at(0)->streetId().value(), 3);
CHECK_EQ(dynamics.itineraries()
.at(dynamics.agents().at(1)->itineraryId())
->destination(),
Itinerary1.destination());
CHECK(dynamics.agents().at(1)->streetId().has_value());
CHECK_EQ(dynamics.agents().at(1)->streetId().value(), 8);
CHECK_EQ(dynamics.itineraries()
.at(dynamics.agents().at(2)->itineraryId())
->destination(),
Itinerary2.destination());
CHECK(dynamics.agents().at(2)->streetId().has_value());
CHECK_EQ(dynamics.agents().at(2)->streetId().value(), 1);
#endif
}
}
}
Expand Down
Loading