Skip to content

Commit

Permalink
feat(imp):[#214] fix license header and merge conflict compile problem
Browse files Browse the repository at this point in the history
  • Loading branch information
dsmf committed Jan 23, 2024
1 parent 8032c80 commit efb20dd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/********************************************************************************
* Copyright (c) 2021,2022,2023
* Copyright (c) 2022,2024
* 2022: ZF Friedrichshafen AG
* 2022: ISTOS GmbH
* 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* 2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* 2022,2023: BOSCH AG
* Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/********************************************************************************
* Copyright (c) 2021,2022,2023
* Copyright (c) 2022,2024
* 2022: ZF Friedrichshafen AG
* 2022: ISTOS GmbH
* 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* 2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* 2022,2023: BOSCH AG
* Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation
* Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,12 @@ void shouldReturnExpectedGlobalAssetId() throws RegistryServiceException {
expectedShell);

// when
final var assetAdministrationShellDescriptors = sut.lookupGlobalAssetIds(digitalTwinRegistryKey.bpn());
final var assetAdministrationShellDescriptors = sut.lookupShellsByBPN(digitalTwinRegistryKey.bpn());

String actualGlobalAssetId = assetAdministrationShellDescriptors.stream().findFirst().map(AssetAdministrationShellDescriptor::getGlobalAssetId).get();// then
String actualGlobalAssetId = assetAdministrationShellDescriptors.stream()
.findFirst()
.map(AssetAdministrationShellDescriptor::getGlobalAssetId)
.get();// then
assertThat(actualGlobalAssetId).isEqualTo(expectedGlobalAssetId);
}

Expand All @@ -237,7 +240,7 @@ void whenInterruptedExceptionOccurs() throws ExecutionException, InterruptedExce
simulateResultFinderInterrupted();

// when
final ThrowingCallable call = () -> sut.lookupGlobalAssetIds("dummyBpn");
final ThrowingCallable call = () -> sut.lookupShellsByBPN("dummyBpn");

// then
assertThatThrownBy(call).isInstanceOf(ShellNotFoundException.class)
Expand All @@ -251,7 +254,7 @@ void whenExecutionExceptionOccurs() {

// when
final var bpn = "dummyBpn";
final ThrowingCallable call = () -> sut.lookupGlobalAssetIds(bpn);
final ThrowingCallable call = () -> sut.lookupShellsByBPN(bpn);

// then
assertThatThrownBy(call).isInstanceOf(RegistryServiceRuntimeException.class)
Expand Down

0 comments on commit efb20dd

Please sign in to comment.