Fix: AasService Thumbnail Tests #298
Conversation
|
@mateusmolina-iese Please check now. Fixed the commit issue in this draft PR. |
....aasservice-core/src/test/java/org/eclipse/digitaltwin/basyx/aasservice/AasServiceSuite.java
Outdated
Show resolved
Hide resolved
....aasservice-core/src/test/java/org/eclipse/digitaltwin/basyx/aasservice/AasServiceSuite.java
Outdated
Show resolved
Hide resolved
| @Before | ||
| public void setUp() throws IOException { | ||
| AssetAdministrationShell expected = DummyAssetAdministrationShellFactory.create(); | ||
| aasServiceWithThumbnail = getAasService(expected); |
There was a problem hiding this comment.
This should be createWithDefaultThumbnail
....aasservice-core/src/test/java/org/eclipse/digitaltwin/basyx/aasservice/AasServiceSuite.java
Show resolved
Hide resolved
…Memory and MongoDB
| @@ -244,4 +245,9 @@ public void getPaginatedAssetAdministrationShellIterating() { | |||
| public AasService getAasService(AssetAdministrationShell shell) { | |||
| return new AasRepositoryAasServiceWrapper(getAasRepository(), shell); | |||
| } | |||
|
|
|||
| @Override | |||
| public FileRepository getFileRepository() { | |||
There was a problem hiding this comment.
You don't need to overwrite it
There was a problem hiding this comment.
I did this over here to avoid implementing it in to the child classes because for some, there is no FileRepository implementation. Returning null here just allows me to set a default FileRepository in case nothing is present.
There was a problem hiding this comment.
Fixed.
| @@ -33,5 +33,10 @@ | |||
| <classifier>tests</classifier> | |||
| <scope>test</scope> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>org.eclipse.digitaltwin.basyx</groupId> | |||
There was a problem hiding this comment.
Please remove this dependency
| @@ -65,14 +66,25 @@ public class TestMongoDBAasRepository extends AasRepositorySuite { | |||
|
|
|||
| private static GridFsTemplate gridFsTemplate = configureDefaultGridFsTemplate(mongoTemplate); | |||
|
|
|||
| private FileRepository fileRepository; | |||
There was a problem hiding this comment.
Initialize fileRepository directly here, instead of using a constructor in the test class; Also mark it as static.
| fileRepository = getFileRepository(); | ||
|
|
||
| if (fileRepository == null) { | ||
| fileRepository = new InMemoryFileRepository(); |
There was a problem hiding this comment.
You don't need to define a default FileRepository in the abstract suite
|
|
||
| <dependency> | ||
| <groupId>org.eclipse.digitaltwin.basyx</groupId> | ||
| <artifactId>basyx.filerepository-backend-inmemory</artifactId> |
There was a problem hiding this comment.
Please remove this dep
|
|
||
| aasService.getThumbnail(); | ||
| try { | ||
| aasServiceWithThumbnail.getThumbnail(); |
There was a problem hiding this comment.
use AssertThrows here
| @@ -158,14 +183,13 @@ public void getPaginatedSubmodelReferencesPaginated() { | |||
|
|
|||
| @Test | |||
| public void updateThumbnail() throws FileNotFoundException, IOException { | |||
| AssetAdministrationShell shell = DummyAssetAdministrationShellFactory.createWithDefaultThumbnail(); | |||
| AasService aasService = getAasService(shell); | |||
| setAasThumbnail( | |||
There was a problem hiding this comment.
Why use this method?
Instead you should set using aasServiceWithThumbnail.setThumbnail, but with the dummyImageIS_B, since _A is already there
| import org.eclipse.digitaltwin.basyx.core.filerepository.InMemoryFileRepository; | ||
|
|
||
| public class TestInMemoryAasService extends AasServiceSuite { | ||
|
|
||
|
|
||
| private FileRepository fileRepository; |
There was a problem hiding this comment.
Initialize fileRepo directly here; remove constructor; add static mod
| @@ -48,14 +49,25 @@ public class TestInMemoryAasRepository extends AasRepositorySuite { | |||
|
|
|||
| private AasBackendProvider backendProvider = new AasInMemoryBackendProvider(); | |||
|
|
|||
| private FileRepository fileRepository; | |||
|
|
||
| @Override | ||
| protected FileRepository getFileRepository() { | ||
| return null; |
There was a problem hiding this comment.
What are the consequences here?
…vice-thumbnail-test-new Latest updates from parent repo.
…vice-thumbnail-test-new Latest updated from remote/main
The PR Corresponds to the task titled: "Improve testing of Thumbnail CRUD operations in the AasService"
It contains a fix for the following issues:
The getThumbnailTest should not first set the thumbnail; the suite should be the one to provide an AAS with a thumbnail already set
Similarly with updateThumbnail and deleteThumbnail
deleteThumbnail should use fail pattern instead of a global test except.