Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
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-cpplib
Commits
49dc812f
Commit
49dc812f
authored
3 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
ENH: add to_string for extern C
parent
3e95cd2e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#12672
passed with warnings
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12678
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/ccaosdb.h
+3
-0
3 additions, 0 deletions
include/ccaosdb.h
src/ccaosdb.cpp
+30
-0
30 additions, 0 deletions
src/ccaosdb.cpp
test/test_ccaosdb.cpp
+11
-0
11 additions, 0 deletions
test/test_ccaosdb.cpp
with
44 additions
and
0 deletions
include/ccaosdb.h
+
3
−
0
View file @
49dc812f
...
...
@@ -333,6 +333,7 @@ typedef struct {
}
caosdb_entity_message
;
// GETTERS FOR EVERYTHING
int
caosdb_entity_entity_to_string
(
caosdb_entity_entity
*
entity
,
char
**
out
);
int
caosdb_entity_entity_get_id
(
caosdb_entity_entity
*
entity
,
char
**
out
);
int
caosdb_entity_entity_get_role
(
caosdb_entity_entity
*
entity
,
char
**
out
);
int
caosdb_entity_entity_get_name
(
caosdb_entity_entity
*
entity
,
char
**
out
);
...
...
@@ -376,6 +377,7 @@ int caosdb_entity_entity_get_parents_size(caosdb_entity_entity *entity, int *out
int
caosdb_entity_entity_get_parent
(
caosdb_entity_entity
*
entity
,
caosdb_entity_parent
*
out
,
int
index
);
int
caosdb_entity_property_to_string
(
caosdb_entity_property
*
entity
,
char
**
out
);
int
caosdb_entity_property_get_id
(
caosdb_entity_property
*
property
,
char
**
out
);
int
caosdb_entity_property_get_name
(
caosdb_entity_property
*
property
,
char
**
out
);
int
caosdb_entity_property_get_description
(
caosdb_entity_property
*
property
,
char
**
out
);
...
...
@@ -401,6 +403,7 @@ int caosdb_entity_property_get_string_list_value_at(caosdb_entity_property *prop
const
int
index
);
int
caosdb_entity_property_get_value_list_length
(
caosdb_entity_property
*
property
,
int
*
out
);
int
caosdb_entity_parent_to_string
(
caosdb_entity_parent
*
entity
,
char
**
out
);
int
caosdb_entity_parent_get_id
(
caosdb_entity_parent
*
parent
,
char
**
out
);
int
caosdb_entity_parent_get_name
(
caosdb_entity_parent
*
parent
,
char
**
out
);
int
caosdb_entity_parent_get_description
(
caosdb_entity_parent
*
parent
,
char
**
out
);
...
...
This diff is collapsed.
Click to expand it.
src/ccaosdb.cpp
+
30
−
0
View file @
49dc812f
...
...
@@ -584,6 +584,16 @@ ERROR_RETURN_CODE(GENERIC_ERROR, int caosdb_entity_delete_parent(caosdb_entity_p
})
CAOSDB_ENTITY_GET
(
id
,
GetId
())
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
int
caosdb_entity_entity_to_string
(
caosdb_entity_entity
*
entity
,
char
**
out
),
{
auto
*
wrapped_entity
=
WRAPPED_ENTITY_CAST
(
entity
);
std
::
string
role_str
=
wrapped_entity
->
ToString
();
auto
*
tmp
=
(
char
*
)
malloc
(
sizeof
(
char
)
*
role_str
.
length
()
+
1
);
strcpy
(
tmp
,
role_str
.
c_str
());
delete
[]
*
out
;
*
out
=
tmp
;
return
0
;
})
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
int
caosdb_entity_entity_get_role
(
caosdb_entity_entity
*
entity
,
char
**
out
),
{
auto
*
wrapped_entity
=
WRAPPED_ENTITY_CAST
(
entity
);
...
...
@@ -839,10 +849,30 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
})
CAOSDB_PARENT_GET
(
id
,
GetId
())
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
int
caosdb_entity_parent_to_string
(
caosdb_entity_parent
*
entity
,
char
**
out
),
{
auto
*
wrapped_entity
=
WRAPPED_PARENT_CAST
(
entity
);
std
::
string
role_str
=
wrapped_entity
->
ToString
();
auto
*
tmp
=
(
char
*
)
malloc
(
sizeof
(
char
)
*
role_str
.
length
()
+
1
);
strcpy
(
tmp
,
role_str
.
c_str
());
delete
[]
*
out
;
*
out
=
tmp
;
return
0
;
})
CAOSDB_PARENT_GET
(
name
,
GetName
())
CAOSDB_PARENT_GET
(
description
,
GetDescription
())
CAOSDB_PROPERTY_GET
(
id
,
GetId
())
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
int
caosdb_entity_property_to_string
(
caosdb_entity_property
*
entity
,
char
**
out
),
{
auto
*
wrapped_entity
=
WRAPPED_PROPERTY_CAST
(
entity
);
std
::
string
role_str
=
wrapped_entity
->
ToString
();
auto
*
tmp
=
(
char
*
)
malloc
(
sizeof
(
char
)
*
role_str
.
length
()
+
1
);
strcpy
(
tmp
,
role_str
.
c_str
());
delete
[]
*
out
;
*
out
=
tmp
;
return
0
;
})
CAOSDB_PROPERTY_GET
(
name
,
GetName
())
CAOSDB_PROPERTY_GET
(
description
,
GetDescription
())
...
...
This diff is collapsed.
Click to expand it.
test/test_ccaosdb.cpp
+
11
−
0
View file @
49dc812f
...
...
@@ -152,6 +152,9 @@ TEST_F(test_ccaosdb, test_entity) {
EXPECT_EQ
(
return_code
,
0
);
EXPECT_EQ
(
strcmp
(
out
,
"length"
),
0
);
return_code
=
caosdb_entity_entity_to_string
(
&
entity
,
&
out
);
EXPECT_EQ
(
return_code
,
0
);
// test call without validation of result
return_code
=
caosdb_entity_entity_set_role
(
&
entity
,
"FILE"
);
EXPECT_EQ
(
return_code
,
0
);
...
...
@@ -170,6 +173,7 @@ TEST_F(test_ccaosdb, test_entity) {
caosdb_entity_entity_get_role
(
&
entity
,
&
out
);
EXPECT_EQ
(
strcmp
(
out
,
"PROPERTY"
),
0
);
caosdb_entity_entity_set_description
(
&
entity
,
"The length of an object"
);
caosdb_entity_entity_get_description
(
&
entity
,
&
out
);
EXPECT_EQ
(
strcmp
(
out
,
"The length of an object"
),
0
);
...
...
@@ -241,6 +245,9 @@ TEST_F(test_ccaosdb, test_property) {
caosdb_entity_property_get_id
(
&
property
,
&
out
);
EXPECT_EQ
(
strcmp
(
out
,
"some_id"
),
0
);
return_code
=
caosdb_entity_property_to_string
(
&
property
,
&
out
);
EXPECT_EQ
(
return_code
,
0
);
caosdb_entity_property_get_name
(
&
property
,
&
out
);
EXPECT_EQ
(
strcmp
(
out
,
"some_name"
),
0
);
...
...
@@ -341,6 +348,7 @@ TEST_F(test_ccaosdb, test_entity_with_parent_and_property) {
char
*
in
=
nullptr
;
// NOLINT
char
*
out
=
nullptr
;
// NOLINT
// cannot assign an already assigned property
return_code
=
caosdb_entity_entity_get_property
(
&
entity
,
&
input_property
,
0
);
EXPECT_EQ
(
return_code
,
caosdb
::
StatusCode
::
EXTERN_C_ASSIGNMENT_ERROR
);
...
...
@@ -382,6 +390,9 @@ TEST_F(test_ccaosdb, test_entity_with_parent_and_property) {
caosdb_entity_parent_get_name
(
&
output_parent
,
&
out
);
EXPECT_EQ
(
strcmp
(
in
,
out
),
0
);
return_code
=
caosdb_entity_parent_to_string
(
&
input_parent
,
&
out
);
EXPECT_EQ
(
return_code
,
0
);
// Delete everything
return_code
=
caosdb_entity_delete_parent
(
&
input_parent
);
EXPECT_EQ
(
return_code
,
0
);
...
...
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