Skip to content

Commit 4433d09

Browse files
mristinmristin
authored
Update test data to aas-core-meta 77d3442 (#536)
We update the development requirements to and re-record the test data for [aas-core-meta 77d3442]. Notably, we propagate the fix for V3.0 in the meta-model which reverted the order of ``data_specification`` and ``data_specification_content``. This was necessary so that the XML schemas for V3.0 remain backwards compatible. [aas-core-meta 77d3442]: aas-core-works/aas-core-meta@77d3442
1 parent f0f0925 commit 4433d09

File tree

41 files changed

+604
-604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+604
-604
lines changed

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"twine",
5353
"jsonschema==3.2.0",
5454
"xmlschema==3.3.1",
55-
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@35aa2cc#egg=aas-core-meta",
55+
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@77d3442#egg=aas-core-meta",
5656
"ssort==0.12.3",
5757
]
5858
},

‎test_data/cpp/test_main/aas_core_meta.v3/expected_output/enhancing.hpp

+18-18
Original file line numberDiff line numberDiff line change
@@ -7104,20 +7104,6 @@ class EnhancedEmbeddedDataSpecification
71047104
return types::ModelType::kEmbeddedDataSpecification;
71057105
}
71067106

7107-
const std::shared_ptr<types::IDataSpecificationContent>& data_specification_content() const override {
7108-
return instance_->data_specification_content();
7109-
}
7110-
7111-
std::shared_ptr<types::IDataSpecificationContent>& mutable_data_specification_content() override {
7112-
return instance_->mutable_data_specification_content();
7113-
}
7114-
7115-
void set_data_specification_content(
7116-
std::shared_ptr<types::IDataSpecificationContent> value
7117-
) override {
7118-
instance_->set_data_specification_content(value);
7119-
}
7120-
71217107
const std::shared_ptr<types::IReference>& data_specification() const override {
71227108
return instance_->data_specification();
71237109
}
@@ -7132,6 +7118,20 @@ class EnhancedEmbeddedDataSpecification
71327118
instance_->set_data_specification(value);
71337119
}
71347120

7121+
const std::shared_ptr<types::IDataSpecificationContent>& data_specification_content() const override {
7122+
return instance_->data_specification_content();
7123+
}
7124+
7125+
std::shared_ptr<types::IDataSpecificationContent>& mutable_data_specification_content() override {
7126+
return instance_->mutable_data_specification_content();
7127+
}
7128+
7129+
void set_data_specification_content(
7130+
std::shared_ptr<types::IDataSpecificationContent> value
7131+
) override {
7132+
instance_->set_data_specification_content(value);
7133+
}
7134+
71357135
const std::shared_ptr<E>& enhancement() const {
71367136
return enhancement_;
71377137
}
@@ -13524,16 +13524,16 @@ std::shared_ptr<types::IEmbeddedDataSpecification> WrapEmbeddedDataSpecification
1352413524
// We assume that we already checked whether `that` has been enhanced
1352513525
// in the caller.
1352613526

13527-
that->set_data_specification_content(
13527+
that->set_data_specification(
1352813528
Wrap<E>(
13529-
that->data_specification_content(),
13529+
that->data_specification(),
1353013530
factory
1353113531
)
1353213532
);
1353313533

13534-
that->set_data_specification(
13534+
that->set_data_specification_content(
1353513535
Wrap<E>(
13536-
that->data_specification(),
13536+
that->data_specification_content(),
1353713537
factory
1353813538
)
1353913539
);

‎test_data/cpp/test_main/aas_core_meta.v3/expected_output/iteration.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11300,10 +11300,10 @@ void IteratorOverEmbeddedDataSpecification::Execute() {
1130011300
index_ = -1;
1130111301
done_ = false;
1130211302

11303-
property_ = Property::kDataSpecificationContent;
11303+
property_ = Property::kDataSpecification;
1130411304
item_ = std::move(
1130511305
std::static_pointer_cast<types::IClass>(
11306-
casted_->data_specification_content()
11306+
casted_->data_specification()
1130711307
)
1130811308
);
1130911309
++index_;
@@ -11313,10 +11313,10 @@ void IteratorOverEmbeddedDataSpecification::Execute() {
1131311313
}
1131411314

1131511315
case 1: {
11316-
property_ = Property::kDataSpecification;
11316+
property_ = Property::kDataSpecificationContent;
1131711317
item_ = std::move(
1131811318
std::static_pointer_cast<types::IClass>(
11319-
casted_->data_specification()
11319+
casted_->data_specification_content()
1132011320
)
1132111321
);
1132211322
++index_;

‎test_data/cpp/test_main/aas_core_meta.v3/expected_output/jsonization.cpp

+34-34
Original file line numberDiff line numberDiff line change
@@ -23529,8 +23529,8 @@ std::pair<
2352923529
}
2353023530

2353123531
std::set<std::string> kPropertiesInEmbeddedDataSpecification = {
23532-
"dataSpecificationContent",
23533-
"dataSpecification"
23532+
"dataSpecification",
23533+
"dataSpecificationContent"
2353423534
};
2353523535

2353623536
std::pair<
@@ -23585,26 +23585,26 @@ std::pair<
2358523585

2358623586
// region Check required properties
2358723587

23588-
if (!json.contains("dataSpecificationContent")) {
23588+
if (!json.contains("dataSpecification")) {
2358923589
return std::make_pair<
2359023590
common::optional<std::shared_ptr<types::IEmbeddedDataSpecification> >,
2359123591
common::optional<DeserializationError>
2359223592
>(
2359323593
common::nullopt,
2359423594
common::make_optional<DeserializationError>(
23595-
L"The required property dataSpecificationContent is missing"
23595+
L"The required property dataSpecification is missing"
2359623596
)
2359723597
);
2359823598
}
2359923599

23600-
if (!json.contains("dataSpecification")) {
23600+
if (!json.contains("dataSpecificationContent")) {
2360123601
return std::make_pair<
2360223602
common::optional<std::shared_ptr<types::IEmbeddedDataSpecification> >,
2360323603
common::optional<DeserializationError>
2360423604
>(
2360523605
common::nullopt,
2360623606
common::make_optional<DeserializationError>(
23607-
L"The required property dataSpecification is missing"
23607+
L"The required property dataSpecificationContent is missing"
2360823608
)
2360923609
);
2361023610
}
@@ -23615,26 +23615,26 @@ std::pair<
2361523615

2361623616
common::optional<DeserializationError> error;
2361723617

23618-
common::optional<std::shared_ptr<types::IDataSpecificationContent> > the_data_specification_content;
23619-
2362023618
common::optional<std::shared_ptr<types::IReference> > the_data_specification;
2362123619

23620+
common::optional<std::shared_ptr<types::IDataSpecificationContent> > the_data_specification_content;
23621+
2362223622
// endregion Initialization
2362323623

23624-
// region De-serialize dataSpecificationContent
23624+
// region De-serialize dataSpecification
2362523625

2362623626
std::tie(
23627-
the_data_specification_content,
23627+
the_data_specification,
2362823628
error
23629-
) = DeserializeDataSpecificationContent(
23630-
json["dataSpecificationContent"],
23629+
) = DeserializeReference(
23630+
json["dataSpecification"],
2363123631
additional_properties
2363223632
);
2363323633

2363423634
if (error.has_value()) {
2363523635
error->path.segments.emplace_front(
2363623636
common::make_unique<PropertySegment>(
23637-
L"dataSpecificationContent"
23637+
L"dataSpecification"
2363823638
)
2363923639
);
2364023640

@@ -23647,22 +23647,22 @@ std::pair<
2364723647
);
2364823648
}
2364923649

23650-
// endregion De-serialize dataSpecificationContent
23650+
// endregion De-serialize dataSpecification
2365123651

23652-
// region De-serialize dataSpecification
23652+
// region De-serialize dataSpecificationContent
2365323653

2365423654
std::tie(
23655-
the_data_specification,
23655+
the_data_specification_content,
2365623656
error
23657-
) = DeserializeReference(
23658-
json["dataSpecification"],
23657+
) = DeserializeDataSpecificationContent(
23658+
json["dataSpecificationContent"],
2365923659
additional_properties
2366023660
);
2366123661

2366223662
if (error.has_value()) {
2366323663
error->path.segments.emplace_front(
2366423664
common::make_unique<PropertySegment>(
23665-
L"dataSpecification"
23665+
L"dataSpecificationContent"
2366623666
)
2366723667
);
2366823668

@@ -23675,7 +23675,7 @@ std::pair<
2367523675
);
2367623676
}
2367723677

23678-
// endregion De-serialize dataSpecification
23678+
// endregion De-serialize dataSpecificationContent
2367923679

2368023680
return std::make_pair(
2368123681
common::make_optional<
@@ -23685,8 +23685,8 @@ std::pair<
2368523685
// We deliberately do not use std::make_shared here to avoid an unnecessary
2368623686
// upcast.
2368723687
new types::EmbeddedDataSpecification(
23688-
std::move(*the_data_specification_content),
23689-
std::move(*the_data_specification)
23688+
std::move(*the_data_specification),
23689+
std::move(*the_data_specification_content)
2369023690
)
2369123691
),
2369223692
common::nullopt
@@ -36920,17 +36920,17 @@ std::pair<
3692036920

3692136921
common::optional<SerializationError> error;
3692236922

36923-
common::optional<nlohmann::json> json_data_specification_content;
36923+
common::optional<nlohmann::json> json_data_specification;
3692436924
std::tie(
36925-
json_data_specification_content,
36925+
json_data_specification,
3692636926
error
3692736927
) = SerializeIClass(
36928-
*that.data_specification_content()
36928+
*that.data_specification()
3692936929
);
3693036930
if (error.has_value()) {
3693136931
error->path.segments.emplace_front(
3693236932
common::make_unique<iteration::PropertySegment>(
36933-
iteration::Property::kDataSpecificationContent
36933+
iteration::Property::kDataSpecification
3693436934
)
3693536935
);
3693636936

@@ -36943,21 +36943,21 @@ std::pair<
3694336943
);
3694436944
}
3694536945

36946-
result["dataSpecificationContent"] = std::move(
36947-
*json_data_specification_content
36946+
result["dataSpecification"] = std::move(
36947+
*json_data_specification
3694836948
);
3694936949

36950-
common::optional<nlohmann::json> json_data_specification;
36950+
common::optional<nlohmann::json> json_data_specification_content;
3695136951
std::tie(
36952-
json_data_specification,
36952+
json_data_specification_content,
3695336953
error
3695436954
) = SerializeIClass(
36955-
*that.data_specification()
36955+
*that.data_specification_content()
3695636956
);
3695736957
if (error.has_value()) {
3695836958
error->path.segments.emplace_front(
3695936959
common::make_unique<iteration::PropertySegment>(
36960-
iteration::Property::kDataSpecification
36960+
iteration::Property::kDataSpecificationContent
3696136961
)
3696236962
);
3696336963

@@ -36970,8 +36970,8 @@ std::pair<
3697036970
);
3697136971
}
3697236972

36973-
result["dataSpecification"] = std::move(
36974-
*json_data_specification
36973+
result["dataSpecificationContent"] = std::move(
36974+
*json_data_specification_content
3697536975
);
3697636976

3697736977
return std::make_pair<

‎test_data/cpp/test_main/aas_core_meta.v3/expected_output/types.cpp

+18-18
Original file line numberDiff line numberDiff line change
@@ -6911,32 +6911,18 @@ void Environment::set_concept_descriptions(
69116911
// region EmbeddedDataSpecification
69126912

69136913
EmbeddedDataSpecification::EmbeddedDataSpecification(
6914-
std::shared_ptr<IDataSpecificationContent> data_specification_content,
6915-
std::shared_ptr<IReference> data_specification
6914+
std::shared_ptr<IReference> data_specification,
6915+
std::shared_ptr<IDataSpecificationContent> data_specification_content
69166916
) {
6917-
data_specification_content_ = std::move(data_specification_content);
6918-
69196917
data_specification_ = std::move(data_specification);
6918+
6919+
data_specification_content_ = std::move(data_specification_content);
69206920
}
69216921

69226922
ModelType EmbeddedDataSpecification::model_type() const {
69236923
return ModelType::kEmbeddedDataSpecification;
69246924
}
69256925

6926-
const std::shared_ptr<IDataSpecificationContent>& EmbeddedDataSpecification::data_specification_content() const {
6927-
return data_specification_content_;
6928-
}
6929-
6930-
std::shared_ptr<IDataSpecificationContent>& EmbeddedDataSpecification::mutable_data_specification_content() {
6931-
return data_specification_content_;
6932-
}
6933-
6934-
void EmbeddedDataSpecification::set_data_specification_content(
6935-
std::shared_ptr<IDataSpecificationContent> value
6936-
) {
6937-
data_specification_content_ = value;
6938-
}
6939-
69406926
const std::shared_ptr<IReference>& EmbeddedDataSpecification::data_specification() const {
69416927
return data_specification_;
69426928
}
@@ -6951,6 +6937,20 @@ void EmbeddedDataSpecification::set_data_specification(
69516937
data_specification_ = value;
69526938
}
69536939

6940+
const std::shared_ptr<IDataSpecificationContent>& EmbeddedDataSpecification::data_specification_content() const {
6941+
return data_specification_content_;
6942+
}
6943+
6944+
std::shared_ptr<IDataSpecificationContent>& EmbeddedDataSpecification::mutable_data_specification_content() {
6945+
return data_specification_content_;
6946+
}
6947+
6948+
void EmbeddedDataSpecification::set_data_specification_content(
6949+
std::shared_ptr<IDataSpecificationContent> value
6950+
) {
6951+
data_specification_content_ = value;
6952+
}
6953+
69546954
// endregion EmbeddedDataSpecification
69556955

69566956
// region LevelType

0 commit comments

Comments
 (0)