Skip to content
Snippets Groups Projects
Verified Commit a572d9d7 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-multi-retrieve' into f-update

parents 11ba13a1 7338d3b4
Branches
Tags
1 merge request!6F update
Pipeline #11316 failed
......@@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
* Initial release.
### Changed
### Deprecated
......
......@@ -177,7 +177,7 @@ target_link_libraries(ccaosdb
${CONAN_LIBS}
)
add_executable(ccaosdbcli src/ccaosdbcli.c)
add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c)
target_include_directories(ccaosdbcli PUBLIC
$<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
......@@ -189,7 +189,7 @@ target_link_libraries(ccaosdbcli
${CONAN_LIBS}
)
add_executable(cxxcaosdbcli src/cxxcaosdbcli.cpp)
add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp)
target_include_directories(cxxcaosdbcli PUBLIC
$<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
......
......@@ -26,6 +26,7 @@
#include "boost/json/object.hpp" // for object
#include "boost/json/value.hpp" // for value
#include "boost/json/value_ref.hpp" // IWYU pragma: keep
// IWYU pragma: no_include "boost/json/fwd.hpp"
#include "caosdb/authentication.h" // for Authenticator, PlainPassw...
#include "caosdb/certificate_provider.h" // for CertificateProvider, path
#include "caosdb/exceptions.h" // for ConfigurationError
......
......@@ -450,7 +450,6 @@ public:
auto AppendProperty(const Property &property) -> void;
auto AppendParent(const Parent &parent) -> void;
auto Switch(ProtoEntity *entity) -> void;
/**
* Copy all of this entity's features to the target ProtoEntity.
*/
......
Subproject commit daf705ef4e86c30f96b3aac429a66667f50c7b77
Subproject commit 36d7956b6eca506fb87096d8d50b6f4b820778b8
......@@ -177,13 +177,6 @@ auto Entity::SetVersionId(const std::string &id) -> void {
this->wrapped->mutable_version()->set_id(id);
}
// TODO(tf) Re-implement s.th. properties and parents are kept.
auto Entity::Switch(ProtoEntity *entity) -> void {
this->wrapped->Swap(entity);
this->wrapped->Clear();
this->wrapped = entity;
}
auto Entity::CopyTo(ProtoEntity *target) -> void {
target->CopyFrom(*(this->wrapped));
}
......
......@@ -36,7 +36,7 @@ set(test_cases
# special linting for tests
set(_CMAKE_CXX_CLANG_TIDY_TEST_CHECKS
"${_CMAKE_CXX_CLANG_TIDY_CHECKS},-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto"
"${_CMAKE_CXX_CLANG_TIDY_CHECKS},-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity"
)
# add special cmake functions for gtest
......
......@@ -38,8 +38,7 @@ protected:
void TearDown() override { ConfigurationManager::Clear(); }
};
// TODO(tf) cogintive complexity > 25 (threshold)
TEST_F(test_configuration, load_json) { // NOLINT
TEST_F(test_configuration, load_json) {
ConfigurationManager::LoadSingleJSONConfiguration(TEST_DATA_DIR +
"/test_caosdb_client.json");
EXPECT_THROW_MESSAGE(
......@@ -53,9 +52,7 @@ TEST_F(test_configuration, load_json) { // NOLINT
ConfigurationManager::Clear();
}
// TODO(tf) cognitive complexity again
TEST_F(test_configuration, // NOLINT
get_default_connection_configuration_error) { // NOLINT
TEST_F(test_configuration, get_default_connection_configuration_error) {
EXPECT_THROW_MESSAGE(ConfigurationManager::GetDefaultConnectionName(),
ConfigurationError,
"This CaosDB client has not been configured.");
......
......@@ -65,8 +65,7 @@ TEST_F(test_connection, configure_ssl_localhost_8080) {
EXPECT_TRUE(sslcc != nullptr);
}
// TODO(tf) cognitive complexity > 25 (threshold)
TEST_F(test_connection, connection_manager_unknown_connection) { // NOLINT
TEST_F(test_connection, connection_manager_unknown_connection) {
EXPECT_THROW_MESSAGE(ConnectionManager::GetConnection("test"),
caosdb::exceptions::UnknownConnectionError,
"No connection named 'test' present.");
......
......@@ -78,8 +78,7 @@ TEST(test_entity, test_property_setters) {
EXPECT_EQ(prop.GetDatatype(), "prop_dtype");
}
// TODO(fspreck) cognitive complexity > 25 (threshold)
TEST(test_entity, test_append_property) { // NOLINT
TEST(test_entity, test_append_property) {
auto entity = Entity();
auto prop = Property();
......@@ -151,8 +150,7 @@ TEST(test_entity, test_insert_entity) {
EXPECT_EQ(entity.GetName(), "entity_name");
}
// TODO(fspreck) cognitive complexity > 25 (threshold)
TEST(test_entity, test_insert_with_role) { // NOLINT
TEST(test_entity, test_insert_with_role) {
auto transaction = caosdb::transaction::Transaction(
std::shared_ptr<transaction::EntityTransactionService::Stub>(nullptr));
......@@ -197,8 +195,7 @@ TEST(test_entity, test_insert_with_parent) {
EXPECT_EQ(inserted_parent.GetName(), parent.GetName());
}
// TODO(fspreck) cognitive complexity > 25 (threshold)
TEST(test_entity, test_insert_with_property) { // NOLINT
TEST(test_entity, test_insert_with_property) {
auto transaction = caosdb::transaction::Transaction(
std::shared_ptr<transaction::EntityTransactionService::Stub>(nullptr));
......@@ -229,8 +226,7 @@ TEST(test_entity, test_insert_with_property) { // NOLINT
EXPECT_EQ(prop.GetDatatype(), inserted_prop.GetDatatype());
}
// TODO(tf) cognitive complexity > 25 (threshold)
TEST(test_entity, test_from_id_response) { // NOLINT
TEST(test_entity, test_from_id_response) {
IdResponse idResponse;
idResponse.set_id("entity_id");
auto *error = idResponse.add_entity_errors();
......
......@@ -29,8 +29,7 @@ namespace caosdb {
using caosdb::entity::v1alpha1::Entity;
using caosdb::entity::v1alpha1::Message;
// TODO(tf) cognitive complexity > 25 (threshold)
TEST(test_protobuf, test_swap_trivial) { // NOLINT
TEST(test_protobuf, test_swap_trivial) {
Message message_source;
message_source.set_code(1234);
message_source.set_description("desc");
......@@ -50,8 +49,7 @@ TEST(test_protobuf, test_swap_trivial) { // NOLINT
EXPECT_EQ(message_destination.description(), "desc");
}
// TODO(tf) cognitive complexity again
TEST(test_protobuf, test_swap_nested) { // NOLINT
TEST(test_protobuf, test_swap_nested) {
Entity entity_source;
entity_source.set_id("entity_id");
auto *version_source = entity_source.mutable_version();
......
......@@ -41,8 +41,7 @@ using caosdb::exceptions::ConnectionError;
using caosdb::transaction::UniqueResult;
using ProtoEntity = caosdb::entity::v1alpha1::Entity;
// TODO(tf) cognitive complexity > 25 (threshold)
TEST(test_transaction, create_transaction) { // NOLINT
TEST(test_transaction, create_transaction) {
const auto *host = "localhost";
auto configuration = InsecureConnectionConfiguration(host, 8000);
Connection connection(configuration);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment