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
4796d431
"test/git@gitlab.indiscale.com:caosdb/src/caosdb-cpplib.git" did not exist on "01cf45347c9e6a27bd99daac7566635ce19c3aa0"
Commit
4796d431
authored
3 years ago
by
florian
Browse files
Options
Downloads
Patches
Plain Diff
STY: Formatting
parent
f17a3636
No related branches found
No related tags found
1 merge request
!12
F consolidation
Pipeline
#12218
failed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/caosdb/data_type.h
+4
-3
4 additions, 3 deletions
include/caosdb/data_type.h
include/caosdb/entity.h
+2
-2
2 additions, 2 deletions
include/caosdb/entity.h
test/test_entity.cpp
+5
-5
5 additions, 5 deletions
test/test_entity.cpp
with
11 additions
and
10 deletions
include/caosdb/data_type.h
+
4
−
3
View file @
4796d431
...
@@ -20,9 +20,10 @@
...
@@ -20,9 +20,10 @@
*/
*/
/**
/**
* DataTypes have 2 dimensions: They may be atomic or reference typed, and they may be scalar or
* DataTypes have 2 dimensions: They may be atomic or reference typed, and they
* list valued. If they are atomic, they have an AtomicDataType. If they are reference typed, the
* may be scalar or list valued. If they are atomic, they have an
* reference name can be obtained with GetName().
* AtomicDataType. If they are reference typed, the reference name can be
* obtained with GetName().
*/
*/
#ifndef CAOSDB_DATA_TYPE_H
#ifndef CAOSDB_DATA_TYPE_H
...
...
This diff is collapsed.
Click to expand it.
include/caosdb/entity.h
+
2
−
2
View file @
4796d431
...
@@ -559,8 +559,8 @@ private:
...
@@ -559,8 +559,8 @@ private:
*
*
* Should only be instantiated and write-accessed by the owning entity.
* Should only be instantiated and write-accessed by the owning entity.
*
*
* Note that iterating over the Property contents only works via references,
since the Property copy
* Note that iterating over the Property contents only works via references,
* constructor is deliberately disabled:
*
since the Property copy
constructor is deliberately disabled:
*
*
* \code
* \code
* // Accessing single properties as reference
* // Accessing single properties as reference
...
...
This diff is collapsed.
Click to expand it.
test/test_entity.cpp
+
5
−
5
View file @
4796d431
...
@@ -31,10 +31,10 @@
...
@@ -31,10 +31,10 @@
#include
"caosdb/transaction.h"
// for Transaction
#include
"caosdb/transaction.h"
// for Transaction
#include
"caosdb/value.h"
// for Value
#include
"caosdb/value.h"
// for Value
#include
<exception>
#include
<exception>
#include
<google/protobuf/arena.h>
// for Arena
#include
<google/protobuf/arena.h>
// for Arena
#include
<gtest/gtest-message.h>
// for Message
#include
<gtest/gtest-message.h>
// for Message
#include
<gtest/gtest-test-part.h>
// for TestPartResult, Sui...
#include
<gtest/gtest-test-part.h>
// for TestPartResult, Sui...
#include
<gtest/gtest_pred_impl.h>
// for Test, EXPECT_EQ
#include
<gtest/gtest_pred_impl.h>
// for Test, EXPECT_EQ
#include
<iostream>
#include
<iostream>
#include
<memory>
// for allocator, shared_ptr
#include
<memory>
// for allocator, shared_ptr
#include
<stdexcept>
#include
<stdexcept>
...
@@ -398,7 +398,7 @@ TEST(test_entity, test_property_iterator) {
...
@@ -398,7 +398,7 @@ TEST(test_entity, test_property_iterator) {
ASSERT_EQ
(
entity
.
GetProperties
().
size
(),
5
);
ASSERT_EQ
(
entity
.
GetProperties
().
size
(),
5
);
int
counter
=
0
;
int
counter
=
0
;
for
(
auto
&
property
:
entity
.
GetProperties
())
{
for
(
auto
&
property
:
entity
.
GetProperties
())
{
// TODO Copy constructor was deleted
// TODO
(tf)
Copy constructor was deleted
// auto nonref_property = entity.GetProperties().at(counter);
// auto nonref_property = entity.GetProperties().at(counter);
auto
name
=
"PROPERTY-"
+
std
::
to_string
(
counter
);
auto
name
=
"PROPERTY-"
+
std
::
to_string
(
counter
);
EXPECT_EQ
(
property
.
GetName
(),
name
);
EXPECT_EQ
(
property
.
GetName
(),
name
);
...
...
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