Skip to content

feat: use cucumber/tag-expressions #385

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
Daan Timmer (daantimmer) merged 4 commits into from
Aug 24, 2026
Merged

feat: use cucumber/tag-expressions #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a615387
feat: use cucumber/tag-expressions
daantimmer Aug 23, 2026
dddf400
correct includes
daantimmer Aug 23, 2026
5c4b70f
set correct renovate settings, add version to query and tag-expressio…
daantimmer Aug 24, 2026
3c41458
remove commented line
daantimmer Aug 24, 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
43 changes: 28 additions & 15 deletions cmake/dependencies.cpm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,32 @@ macro(ccr_dependency PREFIX TAG DIGEST)
endmacro()

# renovate: datasource=github-tags packageName=cpm-cmake/CPM.cmake versioning=semver
ccr_dependency(CPM_DOWNLOAD v0.43.1 456cb6754daaa010d57444d0c8ce6d95ecf006ab)
ccr_dependency(CPM_DOWNLOAD v0.43.1 456cb6754daaa010d57444d0c8ce6d95ecf006ab)
set(CPM_DOWNLOAD_SHA256 "1c40fc102ce9625d7de7eb14f541cab30cc3138dca627f0b0ec40293ce6c2934")
# renovate: datasource=github-tags packageName=nlohmann/json versioning=semver
ccr_dependency(NLOHMANN_JSON v3.12.0 55f93686c01528224f448c19128836e7df245f72)
ccr_dependency(NLOHMANN_JSON v3.12.0 55f93686c01528224f448c19128836e7df245f72)
# renovate: datasource=github-tags packageName=cucumber/messages versioning=semver
ccr_dependency(CUCUMBER_MESSAGES v34.0.0 8cd6cacecd0a657095c93b069c850f51009e0499)
ccr_dependency(CUCUMBER_MESSAGES v34.0.0 8cd6cacecd0a657095c93b069c850f51009e0499)
# renovate: datasource=github-tags packageName=cucumber/gherkin versioning=semver
ccr_dependency(CUCUMBER_GHERKIN v42.0.0 85b41deb147e18421fe1023a0c496558caccaaa9)
# renovate: datasource=github-tags packageName=cucumber/gherkin versioning=semver
ccr_dependency(CUCUMBER_QUERY v1.0.0 2d432352bb6d82c4092ce8b33f280149b1f7fcea)
ccr_dependency(CUCUMBER_GHERKIN v42.0.0 85b41deb147e18421fe1023a0c496558caccaaa9)
# renovate: datasource=github-tags packageName=cucumber/query versioning=semver
ccr_dependency(CUCUMBER_QUERY v1.0.0 2d432352bb6d82c4092ce8b33f280149b1f7fcea)
# renovate: datasource=github-tags packageName=cucumber/tag-expressions versioning=semver
ccr_dependency(CUCUMBER_TAG_EXPRESSIONS v1.0.0 2d2e9ac1d84a2e05154fa982a276a04e3d1b3650)
# renovate: datasource=github-tags packageName=google/googletest versioning=semver
ccr_dependency(GOOGLE_TEST v1.17.0 52eb8108c5bdec04579160ae17225d66034bd723)
ccr_dependency(GOOGLE_TEST v1.17.0 52eb8108c5bdec04579160ae17225d66034bd723)
# renovate: datasource=github-tags packageName=CLIUtils/CLI11 versioning=semver
ccr_dependency(CLI11 v2.6.2 37bb6edc5317e99af72ef48405e65d9ca5218861)
ccr_dependency(CLI11 v2.6.2 37bb6edc5317e99af72ef48405e65d9ca5218861)
# renovate: datasource=github-tags packageName=fmtlib/fmt versioning=semver
ccr_dependency(LIBFMT v12.1.0 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f)
ccr_dependency(LIBFMT v12.1.0 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f)
# renovate: datasource=github-tags packageName=zeux/pugixml versioning=semver
ccr_dependency(PUGIXML v1.15 ee86beb30e4973f5feffe3ce63bfa4fbadf72f38)
ccr_dependency(PUGIXML v1.15 ee86beb30e4973f5feffe3ce63bfa4fbadf72f38)
# renovate: datasource=github-tags packageName=abseil/abseil-cpp
ccr_dependency(ABSEIL_CPP 20250814.2 0cf0a5c9d12cc3783363ab20f11613e69fd04c9a)
ccr_dependency(ABSEIL_CPP 20250814.2 0cf0a5c9d12cc3783363ab20f11613e69fd04c9a)
# renovate: datasource=github-tags packageName=google/re2
ccr_dependency(RE2 2025-08-12 0f6c07eae69151e606acb3d9232750c3442dff23)
ccr_dependency(RE2 2025-08-12 0f6c07eae69151e606acb3d9232750c3442dff23)
# renovate: datasource=github-tags packageName=jbeder/yaml-cpp versioning=semver
ccr_dependency(YAML_CPP v0.9.0 56e3bb550c91fd7005566f19c079cb7a503223cf)
ccr_dependency(YAML_CPP v0.9.0 56e3bb550c91fd7005566f19c079cb7a503223cf)

if(CCR_FETCH_DEPS)
if(NOT COMMAND CPMAddPackage)
Expand Down Expand Up @@ -86,7 +88,7 @@ if(CCR_FETCH_DEPS)
# cucumber_gherkin
# ---------------------------------------------------------------------------
CPMAddPackage(
URI "gh:cucumber/gherkin#${CUCUMBER_GHERKIN_DIGEST}"
URI "gh:cucumber/gherkin@${CUCUMBER_GHERKIN_VERSION}#${CUCUMBER_GHERKIN_DIGEST}"
NAME cucumber_gherkin
SOURCE_SUBDIR cpp
)
Expand All @@ -95,11 +97,20 @@ if(CCR_FETCH_DEPS)
# cucumber_query
# ---------------------------------------------------------------------------
CPMAddPackage(
URI "gh:cucumber/query#${CUCUMBER_QUERY_DIGEST}"
URI "gh:cucumber/query@${CUCUMBER_QUERY_VERSION}#${CUCUMBER_QUERY_DIGEST}"
NAME cucumber_query
SOURCE_SUBDIR cpp
)

# ---------------------------------------------------------------------------
# cucumber_tag_expressions
# ---------------------------------------------------------------------------
CPMAddPackage(
URI "gh:cucumber/tag-expressions@${CUCUMBER_TAG_EXPRESSIONS_VERSION}#${CUCUMBER_TAG_EXPRESSIONS_DIGEST}"
NAME cucumber_tag_expressions
SOURCE_SUBDIR cpp
)
Comment thread
daantimmer marked this conversation as resolved.

# ---------------------------------------------------------------------------
# GoogleTest
# ---------------------------------------------------------------------------
Expand Down Expand Up @@ -182,6 +193,8 @@ else()
find_package(nlohmann_json ${NLOHMANN_JSON_VERSION} REQUIRED)
find_package(cucumber_messages ${CUCUMBER_MESSAGES_VERSION} REQUIRED)
find_package(cucumber_gherkin ${CUCUMBER_GHERKIN_VERSION} REQUIRED)
find_package(cucumber_query ${CUCUMBER_QUERY_VERSION} REQUIRED)
find_package(cucumber_tag_expressions ${CUCUMBER_TAG_EXPRESSIONS_VERSION} REQUIRED)
find_package(GTest REQUIRED)
find_package(pugixml ${PUGIXML_VERSION} REQUIRED)
find_package(fmt ${LIBFMT_VERSION} REQUIRED)
Expand Down
6 changes: 3 additions & 3 deletions cucumber_cpp/library/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "CLI/Validators.hpp"
#include "CLI/impl/App_inl.hpp"
#include "cucumber/gherkin/Demangle.hpp"
#include "cucumber/tag-expressions/Parser.hpp"
#include "cucumber_cpp/library/Context.hpp"
#include "cucumber_cpp/library/Errors.hpp"
#include "cucumber_cpp/library/api/Formatters.hpp"
Expand All @@ -15,7 +16,6 @@
#include "cucumber_cpp/library/plugin/DynamicLibraryManager.hpp"
#include "cucumber_cpp/library/support/DefinitionRegistration.hpp"
#include "cucumber_cpp/library/support/Types.hpp"
#include "cucumber_cpp/library/tag_expression/Parser.hpp"
#include "cucumber_cpp/library/util/Duration.hpp"
#include "cucumber_cpp/library/util/Timestamp.hpp"
#include "fmt/base.h"
Expand Down Expand Up @@ -247,7 +247,7 @@ namespace cucumber_cpp::library
const auto runOptions = support::RunOptions{
.sources = {
.paths = GetFeatureFiles(options),
.tagExpression = tag_expression::Parse(fmt::to_string(fmt::join(options.tags, " "))),
.tagExpression = cucumber::tag_expressions::Parse(fmt::to_string(fmt::join(options.tags, " "))),
.ordering = options.ordering,
},
.runtime = {
Expand All @@ -256,7 +256,7 @@ namespace cucumber_cpp::library
.failGlobalHookFast = options.failGlobalHookFast,
.retry = options.retry,
.strict = options.strict,
.retryTagExpression = tag_expression::Parse(fmt::to_string(fmt::join(options.retryTagFilter, " "))),
.retryTagExpression = cucumber::tag_expressions::Parse(fmt::to_string(fmt::join(options.retryTagFilter, " "))),
.featureHooks = options.featureHooks,
},
};
Expand Down
15 changes: 7 additions & 8 deletions cucumber_cpp/library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ target_include_directories(cucumber_cpp.library PUBLIC
)

target_link_libraries(cucumber_cpp.library PUBLIC
GTest::gtest
GTest::gmock
cucumber_gherkin_lib
CLI11::CLI11
cucumber_cpp.library.api
cucumber_cpp.library.engine
cucumber_cpp.library.plugin
cucumber_cpp.library.tag_expression
cucumber_cpp.library.util
cucumber_cpp.library.formatter
cucumber_cpp.library.plugin
cucumber_cpp.library.support
CLI11::CLI11
cucumber_cpp.library.util
cucumber_gherkin_lib
cucumber::tag_expressions
GTest::gmock
GTest::gtest
)

target_compile_options(cucumber_cpp.library
Expand All @@ -45,7 +45,6 @@ add_subdirectory(formatter)
add_subdirectory(plugin)
add_subdirectory(runtime)
add_subdirectory(support)
add_subdirectory(tag_expression)
add_subdirectory(util)
Comment thread
daantimmer marked this conversation as resolved.

if (CCR_BUILD_TESTS)
Expand Down
2 changes: 1 addition & 1 deletion cucumber_cpp/library/support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ target_link_libraries(cucumber_cpp.library.support PUBLIC
GTest::gtest
GTest::gmock
cucumber_cpp.library.cucumber_expression
cucumber_cpp.library.tag_expression
cucumber::tag_expressions
cucumber_cpp.library.util
fmt::fmt
)
Expand Down
4 changes: 2 additions & 2 deletions cucumber_cpp/library/support/HookRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

#include "cucumber_cpp/library/support/HookRegistry.hpp"
#include "cucumber/gherkin/IdGenerator.hpp"
#include "cucumber/tag-expressions/Parser.hpp"
#include "cucumber_cpp/library/support/DefinitionRegistration.hpp"
#include "cucumber_cpp/library/support/SupportCodeLibrary.hpp"
#include "cucumber_cpp/library/tag_expression/Parser.hpp"
#include "cucumber_cpp/library/util/HookData.hpp"
#include "cucumber_cpp/library/util/HookFactory.hpp"
#include <cstddef>
Expand Down Expand Up @@ -47,7 +47,7 @@ namespace cucumber_cpp::library::support
.name = name,
.sourceLocation = sourceLocation,
}
, tagExpression{ tag_expression::Parse(expression.value_or("")) }
, tagExpression{ cucumber::tag_expressions::Parse(expression.value_or("")) }
, factory{ factory }
{}

Expand Down
5 changes: 2 additions & 3 deletions cucumber_cpp/library/support/HookRegistry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define CUCUMBER_CPP_HOOKREGISTRY_HPP

#include "cucumber/gherkin/IdGenerator.hpp"
#include "cucumber_cpp/library/tag_expression/Model.hpp"
#include "cucumber/tag-expressions/Model.hpp"
#include "cucumber_cpp/library/util/HookData.hpp"
#include "cucumber_cpp/library/util/HookFactory.hpp"
#include <cstddef>
Expand All @@ -18,7 +18,6 @@

namespace cucumber_cpp::library::support
{

struct HookMatch
{
explicit HookMatch(util::HookFactory factory)
Expand All @@ -36,7 +35,7 @@ namespace cucumber_cpp::library::support

util::HookData data;

std::unique_ptr<tag_expression::Expression> tagExpression;
std::unique_ptr<cucumber::tag_expressions::Expression> tagExpression;
util::HookFactory factory;
};

Expand Down
6 changes: 3 additions & 3 deletions cucumber_cpp/library/support/Types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "cucumber/messages/GherkinDocument.hpp"
#include "cucumber/messages/Location.hpp"
#include "cucumber/messages/Pickle.hpp"
#include "cucumber_cpp/library/tag_expression/Model.hpp"
#include "cucumber/tag-expressions/Model.hpp"
#include <cstddef>
#include <filesystem>
#include <functional>
Expand All @@ -26,7 +26,7 @@ namespace cucumber_cpp::library::support
struct Sources
{
std::set<std::filesystem::path, std::less<>> paths{};
std::unique_ptr<tag_expression::Expression> tagExpression;
std::unique_ptr<cucumber::tag_expressions::Expression> tagExpression;
Ordering ordering{ Ordering::defined };

} sources;
Expand All @@ -38,7 +38,7 @@ namespace cucumber_cpp::library::support
bool failGlobalHookFast{ false };
std::size_t retry{ 0 };
bool strict{ true };
std::unique_ptr<tag_expression::Expression> retryTagExpression{};
std::unique_ptr<cucumber::tag_expressions::Expression> retryTagExpression{};
bool featureHooks{ false };
} runtime;

Expand Down
25 changes: 0 additions & 25 deletions cucumber_cpp/library/tag_expression/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Empty file removed cucumber_cpp/library/tag_expression/Error.cpp
View file
Open in desktop
Empty file.
14 changes: 0 additions & 14 deletions cucumber_cpp/library/tag_expression/Error.hpp
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions cucumber_cpp/library/tag_expression/Model.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading