-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix test resource conflicts from merge
- Loading branch information
1 parent
7642297
commit f095a26
Showing
5 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
edc-extension4aas/src/test/resources/selfDescriptionWithAccessURLS.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"assetAdministrationShells":[{"idsContractId":null,"idsAssetId":null,"idShort":"FestoDemoAAS","identification":{"idType":"Iri","id":"https://example.com/ids/aas/3235_8090_6012_8932"}}],"submodels":[{"idShort":"Config","identification":{"idType":"IRI","id":"https://example.com/ids/sm/1145_8090_6012_5097"}},{"idShort":"Status","identification":{"idType":"IRI","id":"https://example.com/ids/sm/4445_8090_6012_7409"},"submodelElements":[{"idShort":"GripperUp"},{"idShort":"Pressure"},{"idShort":"ProcessCounter"},{"idShort":"ProcessDuration"},{"idShort":"RemainingProcesses"},{"idShort":"GripperOpen"},{"idShort":"DistanceSensor"},{"idShort":"LightGateEntrance"},{"idShort":"LightGateMiddle"},{"idShort":"LightGateExit"},{"idShort":"ConveyorBeltForward"},{"idShort":"ConveyorBeltBackward"},{"idShort":"isRunning"},{"idShort":"LED_green"},{"idShort":"LED_yellow"},{"idShort":"LED_red"},{"idShort":"ConveyorBeltReady"}]},{"idShort":"CalculatedAverages","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2110_9090_6012_8448"},"submodelElements":[{"idShort":"GripperUpAverage"},{"idShort":"GripperOpenAverage"},{"idShort":"DistanceSensorAverage"},{"idShort":"LightGateEntranceAverage"},{"idShort":"LightGateMiddleAverage"},{"idShort":"LightGateExitAverage"},{"idShort":"ConveyorBeltForwardAverage"},{"idShort":"ConveyorBeltBackwardAverage"},{"idShort":"isRunningAverage"},{"idShort":"LED_greenAverage"},{"idShort":"LED_yellowAverage"},{"idShort":"LED_redAverage"},{"idShort":"ConveyorBeltReadyAverage"}]},{"idShort":"DaySummary","identification":{"idType":"IRI","id":"https://example.com/ids/sm/5410_9090_6012_0950"},"submodelElements":[{"idShort":"JTS_data"}]},{"idShort":"ProducerRecommendations","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2402_1191_1022_1090"},"submodelElements":[{"idShort":"Pressure"},{"idShort":"ProcessDuration"}]}],"conceptDescriptions":[{"idsContractId":null,"idsAssetId":null,"idShort":"TestConceptDescription","identification":{"idType":"Iri","id":"https://acplt.org/Test_ConceptDescription"}}]} | ||
| {"assetAdministrationShells":[{"idsContractId":null,"idsAssetId":null,"idShort":"FestoDemoAAS","identification":{"idType":"Iri","id":"https://example.com/ids/aas/3235_8090_6012_8932"},"semanticId":null}],"submodels":[{"idShort":"Config","identification":{"idType":"IRI","id":"https://example.com/ids/sm/1145_8090_6012_5097"},"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"Status","identification":{"idType":"IRI","id":"https://example.com/ids/sm/4445_8090_6012_7409"},"submodelElements":[{"idShort":"GripperUp","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"Pressure","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ProcessCounter","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ProcessDuration","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"RemainingProcesses","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"GripperOpen","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"DistanceSensor","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LightGateEntrance","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LightGateMiddle","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LightGateExit","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ConveyorBeltForward","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ConveyorBeltBackward","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"isRunning","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LED_green","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LED_yellow","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LED_red","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ConveyorBeltReady","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}}],"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"CalculatedAverages","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2110_9090_6012_8448"},"submodelElements":[{"idShort":"GripperUpAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"GripperOpenAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"DistanceSensorAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LightGateEntranceAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LightGateMiddleAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LightGateExitAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ConveyorBeltForwardAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ConveyorBeltBackwardAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"isRunningAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LED_greenAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LED_yellowAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"LED_redAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ConveyorBeltReadyAverage","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}}],"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"DaySummary","identification":{"idType":"IRI","id":"https://example.com/ids/sm/5410_9090_6012_0950"},"submodelElements":[{"idShort":"JTS_data","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}}],"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ProducerRecommendations","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2402_1191_1022_1090"},"submodelElements":[{"idShort":"Pressure","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ProcessDuration","semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}}],"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}}],"conceptDescriptions":[{"idsContractId":null,"idsAssetId":null,"idShort":"TestConceptDescription","identification":{"idType":"Iri","id":"https://acplt.org/Test_ConceptDescription"},"semanticId":null}]} |
2 changes: 1 addition & 1 deletion
2
edc-extension4aas/src/test/resources/selfDescriptionWithAccessURLsSubmodelsOnly.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"submodels":[{"idShort":"Config","identification":{"idType":"IRI","id":"https://example.com/ids/sm/1145_8090_6012_5097"}},{"idShort":"Status","identification":{"idType":"IRI","id":"https://example.com/ids/sm/4445_8090_6012_7409"}},{"idShort":"CalculatedAverages","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2110_9090_6012_8448"}},{"idShort":"DaySummary","identification":{"idType":"IRI","id":"https://example.com/ids/sm/5410_9090_6012_0950"}},{"idShort":"ProducerRecommendations","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2402_1191_1022_1090"}}]} | ||
| {"submodels":[{"idShort":"Config","identification":{"idType":"IRI","id":"https://example.com/ids/sm/1145_8090_6012_5097"},"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"Status","identification":{"idType":"IRI","id":"https://example.com/ids/sm/4445_8090_6012_7409"},"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"CalculatedAverages","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2110_9090_6012_8448"},"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"DaySummary","identification":{"idType":"IRI","id":"https://example.com/ids/sm/5410_9090_6012_0950"},"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}},{"idShort":"ProducerRecommendations","identification":{"idType":"IRI","id":"https://example.com/ids/sm/2402_1191_1022_1090"},"semanticId":{"keys":[{"idType":"IRI","type":"GLOBAL_REFERENCE","value":"0173-1#02-AAO677#002"}]}}]} |
Oops, something went wrong.