Skip to content

Fixed unit tests since status code change. #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5cript merged 3 commits into from
Mar 25, 2026
Merged

Fixed unit tests since status code change. #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fdb942
Fixed unit tests since status code change.
5cript Mar 25, 2026
f5112f5
Fixed macos workflow.
5cript Mar 25, 2026
d3dc357
Tried to set SDK SYSROOT.
5cript Mar 25, 2026
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
24 changes: 12 additions & 12 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,31 +91,31 @@ jobs:
steps:
- uses: actions/checkout@v3

- run: brew install ninja boost cryptopp curl llvm@19
- run: brew install ninja boost cryptopp curl llvm@19 lld@19

- name: Get Brew Prefix
- name: Get LLVM Paths
run: |
echo "BREW_PREFIX=$(brew --prefix)" >> $GITHUB_ENV

- name: Set Env Vars
run: |
echo "export LDFLAGS=-L$BREW_PREFIX/lib" >> $GITHUB_ENV
echo "export CPPFLAGS=-I$BREW_PREFIX/include" >> $GITHUB_ENV
echo "LLVM_PREFIX=$(brew --prefix llvm@19)" >> $GITHUB_ENV
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV

- name: Configure CMake
run: >
cmake
-DCMAKE_C_COMPILER=$BREW_PREFIX/opt/llvm@19/bin/clang
-DCMAKE_CXX_COMPILER=$BREW_PREFIX/opt/llvm@19/bin/clang++
-DCMAKE_LINKER=$BREW_PREFIX/opt/llvm@19/bin/lld
-DCMAKE_C_COMPILER=${{env.LLVM_PREFIX}}/bin/clang
-DCMAKE_CXX_COMPILER=${{env.LLVM_PREFIX}}/bin/clang++
-DCMAKE_LINKER=${{env.BREW_PREFIX}}/opt/lld@19/bin/lld
-DCMAKE_OSX_SYSROOT=${{env.SDKROOT}}
-DCMAKE_CXX_FLAGS="-stdlib=libc++"
-DCMAKE_EXE_LINKER_FLAGS="-L${{env.LLVM_PREFIX}}/lib/c++ -L${{env.LLVM_PREFIX}}/lib/unwind -lunwind -Wl,-rpath,${{env.LLVM_PREFIX}}/lib/c++"
-DROAR_BUILD_TESTS=on
-S ${{github.workspace}}
-B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}
-G"Ninja"
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DBREW_PREFIX="$BREW_PREFIX"
-DBREW_PREFIX="${{env.BREW_PREFIX}}"
-DCMAKE_CXX_EXTENSIONS=on
-DCMAKE_CXX_STANDARD=20

- name: Build
run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}
run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}
12 changes: 6 additions & 6 deletions test/curl/test_request.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace Roar::Tests
TEST_F(CurlRequestTests, CanMakeSimpleGetRequest)
{
auto response = Request{}.get(url("/index.txt"));
EXPECT_EQ(response.code(), http::status::ok) << response.result();
EXPECT_EQ(response.code(), 200) << response.result();
}

TEST_F(CurlRequestTests, CanRetrieveBodyWithStringSink)
Expand Down Expand Up @@ -117,7 +117,7 @@ namespace Roar::Tests
TEST_F(CurlRequestTests, CanGetResponseCode)
{
const auto response = Request{}.get(url("/index.txt"));
EXPECT_EQ(response.code(), boost::beast::http::status::ok);
EXPECT_EQ(response.code(), 200) << response.result();
}

TEST_F(CurlRequestTests, CanGetSizeOfDownload)
Expand Down Expand Up @@ -174,19 +174,19 @@ namespace Roar::Tests
TEST_F(CurlRequestTests, CanMakeDeleteRequest)
{
const auto result = Request{}.delete_(url("/deleteHere"));
EXPECT_EQ(result.code(), boost::beast::http::status::ok);
EXPECT_EQ(result.code(), 200) << result.result();
}

TEST_F(CurlRequestTests, CanMakeOptionsRequest)
{
const auto result = Request{}.options(url("/optionsHere"));
EXPECT_EQ(result.code(), boost::beast::http::status::ok);
EXPECT_EQ(result.code(), 200) << result.result();
}

TEST_F(CurlRequestTests, CanMakeHeadRequest)
{
const auto result = Request{}.head(url("/headHere"));
EXPECT_EQ(result.code(), boost::beast::http::status::ok);
EXPECT_EQ(result.code(), 200) << result.result();
}

TEST_F(CurlRequestTests, CanUseFileAsSource)
Expand Down Expand Up @@ -243,6 +243,6 @@ namespace Roar::Tests
TEST_F(CurlRequestTests, CanPerformBodylessPutViaCustomRequest)
{
const auto result = Request{}.custom("PUT", url("/putHereNothing"));
EXPECT_EQ(result.code(), boost::beast::http::status::no_content);
EXPECT_EQ(result.code(), 204) << result.result();
}
}
6 changes: 3 additions & 3 deletions test/test_cors.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ namespace Roar::Tests
{
std::unordered_map<std::string, std::string> headers;
auto res = Curl::Request{}.headerSink(headers).options(url("/permissiveCors"));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200) << res.result();
ASSERT_NE(std::end(headers), headers.find("Access-Control-Allow-Origin"));
EXPECT_EQ(headers["Access-Control-Allow-Origin"], "*");
}
Expand Down Expand Up @@ -233,13 +233,13 @@ namespace Roar::Tests
{
std::unordered_map<std::string, std::string> headers;
auto res = Curl::Request{}.headerSink(headers).options(urlEncryptedServer("/permissiveCors"));
EXPECT_EQ(res.code(), boost::beast::http::status::forbidden);
EXPECT_EQ(res.code(), 403);
}

TEST_F(CorsTests, PreflightRequestOnEncryptedServerIsAccessibleUnencryptedWhenAllowed)
{
std::unordered_map<std::string, std::string> headers;
auto res = Curl::Request{}.headerSink(headers).options(urlEncryptedServer("/unsecurePermissiveCors"));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200);
}
}
40 changes: 20 additions & 20 deletions test/test_http_server.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace Roar::Tests
TEST_F(HttpServerTests, StringPathIsCorrectlyRouted)
{
auto res = Curl::Request{}.get(url("/index.txt"));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200);
}

TEST_F(HttpServerTests, RegexPathIsCorrectlyRouted)
Expand All @@ -96,7 +96,7 @@ namespace Roar::Tests

nlohmann::json body;
auto res = Curl::Request{}.sink(body).get(url("/something/here"));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200);
EXPECT_EQ(body["path"], "/something/here");
ASSERT_THAT(body["matches"], ElementsAre("something", "here"));
}
Expand All @@ -107,15 +107,15 @@ namespace Roar::Tests

std::string body;
auto res = Curl::Request{}.sink(body).get(url("/a/b"));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200);
EXPECT_EQ(body, "AB");
}

TEST_F(HttpServerTests, EncryptedServerAcceptsEncryptedConnection)
{
auto res =
Curl::Request{}.verifyPeer(false).verifyHost(false).get(urlEncryptedServer("/index.txt", {.secure = true}));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200);
}

TEST_F(HttpServerTests, EncryptedServerDoesNotAcceptUnencryptedConnection)
Expand All @@ -124,35 +124,35 @@ namespace Roar::Tests
auto res = Curl::Request{}.headerSink(headers).verifyPeer(false).verifyHost(false).get(
urlEncryptedServer("/index.txt", {.secure = false}));
EXPECT_NE(headers.find("Strict-Transport-Security"), std::end(headers));
EXPECT_EQ(res.code(), boost::beast::http::status::forbidden);
EXPECT_EQ(res.code(), 403);
}

TEST_F(HttpServerTests, UnencryptedServerDoesNotAcceptEncryptedConnection)
{
auto res = Curl::Request{}.get(url("/a/b", {.secure = true}));
EXPECT_NE(res.result(), CURLE_OK);
EXPECT_NE(res.code(), boost::beast::http::status::ok);
EXPECT_NE(res.code(), 200);
}

TEST_F(HttpServerTests, EncryptedServerDoesAcceptUnencryptedConnectionWhenExplicitlyAllowed)
{
auto res = Curl::Request{}.get(urlEncryptedServer("/unsecure", {.secure = false}));
EXPECT_EQ(res.code(), boost::beast::http::status::no_content);
EXPECT_EQ(res.code(), 204) << res.result();
}

TEST_F(HttpServerTests, CanSendUsingSendIntermediate)
{
std::string body;
auto res = Curl::Request{}.sink(body).get(url("/sendIntermediate", {.secure = false}));
EXPECT_EQ(res.code(), boost::beast::http::status::ok);
EXPECT_EQ(res.code(), 200) << res.result();
EXPECT_EQ(body, "Hi");
}

TEST_F(HttpServerTests, CanSendFilePartially)
{
std::string body;
auto res = Curl::Request{}.sink(body).setHeader("Range", "bytes=0-100").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::partial_content);
EXPECT_EQ(res.code(), 206) << res.result();
ASSERT_EQ(body.size(), 100);
LetterGenerator gen;
bool allEqual = true;
Expand All @@ -177,7 +177,7 @@ namespace Roar::Tests
base.push_back(gen());
auto pos = headers["Content-Type"].find("boundary=");
EXPECT_EQ(pos, std::string::npos);
EXPECT_EQ(res.code(), boost::beast::http::status::partial_content);
EXPECT_EQ(res.code(), 206) << res.result();
EXPECT_EQ(body, base.substr(200, 150));
}

Expand All @@ -194,7 +194,7 @@ namespace Roar::Tests
LetterGenerator gen;
for (int i = 0; i != 1024; ++i)
base.push_back(gen());
EXPECT_EQ(res.code(), boost::beast::http::status::partial_content);
EXPECT_EQ(res.code(), 206);
auto pos = headers["Content-Type"].find("boundary=");
ASSERT_NE(pos, std::string::npos);
const auto boundary = headers["Content-Type"].substr(pos + 9);
Expand Down Expand Up @@ -225,7 +225,7 @@ namespace Roar::Tests
LetterGenerator gen;
for (int i = 0; i != 25000; ++i)
base.push_back(gen());
EXPECT_EQ(res.code(), boost::beast::http::status::partial_content);
EXPECT_EQ(res.code(), 206);
auto pos = headers["Content-Type"].find("boundary=");
ASSERT_NE(pos, std::string::npos);
const auto boundary = headers["Content-Type"].substr(pos + 9);
Expand All @@ -246,28 +246,28 @@ namespace Roar::Tests
TEST_F(HttpServerTests, InvalidRangeRequestIsRejected)
{
auto res = Curl::Request{}.setHeader("Range", "bytes?0-100").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "=0-100").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "asdf").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "bytes=0").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "bytes=x").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "bytes=0-").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "bytes=0-x").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();

res = Curl::Request{}.setHeader("Range", "bytes=100-0").get(url("/slice"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400) << res.result();
}

TEST_F(HttpServerTests, CanExtractAuthorizationScheme)
Expand Down
2 changes: 1 addition & 1 deletion test/test_reading.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ namespace Roar::Tests
using namespace Roar::Literals;
auto now = std::chrono::system_clock::now();
const auto res = Curl::Request{}.emplaceSource<ChunkedSource>(1_MiB).put(url("/failPut"));
EXPECT_EQ(res.code(), boost::beast::http::status::bad_request);
EXPECT_EQ(res.code(), 400);
EXPECT_LT(std::chrono::system_clock::now() - now, std::chrono::seconds{1});
}
}
Loading
Loading