Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cppinttest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-cppinttest
Commits
a89372aa
Commit
a89372aa
authored
3 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
STY: ws
parent
6b87d2fa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#12825
failed
3 years ago
Stage: info
Stage: setup
Stage: build
Stage: test
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/caosdb_test_utility.h
+12
-10
12 additions, 10 deletions
test/caosdb_test_utility.h
test/test_transaction.cpp
+2
-4
2 additions, 4 deletions
test/test_transaction.cpp
with
14 additions
and
14 deletions
test/caosdb_test_utility.h
+
12
−
10
View file @
a89372aa
...
@@ -32,15 +32,17 @@
...
@@ -32,15 +32,17 @@
* @date 2021-07-07
* @date 2021-07-07
*/
*/
#define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \
#define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \
EXPECT_THROW(try { statement; } catch (const exeption_type &e) { \
EXPECT_THROW( \
EXPECT_EQ(std::string(e.what()), message); \
try { statement; } catch (const exeption_type &e) { \
throw; \
EXPECT_EQ(std::string(e.what()), message); \
}, \
throw; \
exeption_type)
}, \
exeption_type)
#define ASSERT_THROW_MESSAGE(statement, exeption_type, message) \
#define ASSERT_THROW_MESSAGE(statement, exeption_type, message) \
ASSERT_THROW(try { statement; } catch (const exeption_type &e) { \
ASSERT_THROW( \
ASSERT_EQ(std::string(e.what()), message); \
try { statement; } catch (const exeption_type &e) { \
throw; \
ASSERT_EQ(std::string(e.what()), message); \
}, \
throw; \
exeption_type)
}, \
exeption_type)
#endif
#endif
This diff is collapsed.
Click to expand it.
test/test_transaction.cpp
+
2
−
4
View file @
a89372aa
...
@@ -695,8 +695,7 @@ auto test_numeric_values_impl(AtomicDataType a_type) -> void {
...
@@ -695,8 +695,7 @@ auto test_numeric_values_impl(AtomicDataType a_type) -> void {
auto
insert_transaction
(
connection
->
CreateTransaction
());
auto
insert_transaction
(
connection
->
CreateTransaction
());
Entity
prop
;
Entity
prop
;
prop
.
SetRole
(
Role
::
PROPERTY
);
prop
.
SetRole
(
Role
::
PROPERTY
);
const
auto
name
=
const
auto
name
=
std
::
string
(
"Prop "
)
+
std
::
to_string
(
i
);
std
::
string
(
"Prop "
)
+
std
::
to_string
(
i
);
std
::
cout
<<
"Creating: "
<<
name
<<
std
::
endl
;
std
::
cout
<<
"Creating: "
<<
name
<<
std
::
endl
;
prop
.
SetName
(
name
);
prop
.
SetName
(
name
);
prop
.
SetDataType
(
a_type
);
prop
.
SetDataType
(
a_type
);
...
@@ -717,8 +716,7 @@ auto test_numeric_values_impl(AtomicDataType a_type) -> void {
...
@@ -717,8 +716,7 @@ auto test_numeric_values_impl(AtomicDataType a_type) -> void {
for
(
const
auto
value
:
values_orig
)
{
for
(
const
auto
value
:
values_orig
)
{
auto
retrieve_transaction
(
connection
->
CreateTransaction
());
auto
retrieve_transaction
(
connection
->
CreateTransaction
());
const
auto
prop
=
props_orig
[
i
];
const
auto
prop
=
props_orig
[
i
];
const
auto
name
=
const
auto
name
=
std
::
string
(
"Prop "
)
+
std
::
to_string
(
i
);
std
::
string
(
"Prop "
)
+
std
::
to_string
(
i
);
std
::
cout
<<
"Retrieving: "
<<
name
<<
std
::
endl
;
std
::
cout
<<
"Retrieving: "
<<
name
<<
std
::
endl
;
const
auto
query
=
std
::
string
(
"FIND ENTITY
\"
"
)
+
name
+
"
\"
"
;
const
auto
query
=
std
::
string
(
"FIND ENTITY
\"
"
)
+
name
+
"
\"
"
;
retrieve_transaction
->
Query
(
query
);
retrieve_transaction
->
Query
(
query
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment