Merge two @before Methods in AASAggregatorSuite into one to clean up (#…

…350)


Signed-off-by: Zai Zhang <[email protected]>

src/test/java/org/eclipse/basyx/testsuite/regression/aas/aggregator/AASAggregatorSuite.java

@@ -66,8 +66,7 @@ public abstract class AASAggregatorSuite {
 	private static final String aas2Category = "TestCategory2";
 
 	// initializing dummy test data
-	@Before
-	public void initAASDummies() {
+	private void initAASDummies() {
 		aas1 = new AssetAdministrationShell(aas1Id, new Identifier(IdentifierType.CUSTOM, aas1Id), new Asset("asset1IdShort", new Identifier(IdentifierType.CUSTOM, "asset1"), AssetKind.INSTANCE));
 		aas1.setDescription(description1);
 		aas1.setCategory(aas1Category);
@@ -79,12 +78,17 @@ public void initAASDummies() {
 
 	protected abstract IAASAggregator getAggregator();
 
-	@Before
-	public void clearAASAggregator() {
+	private void clearAASAggregator() {
 		IAASAggregator aggregator = getAggregator();
 		aggregator.getAASList().stream().map(a -> a.getIdentification()).forEach(id -> aggregator.deleteAAS(id));
 	}
 
+	@Before
+	public void setup() {
+		initAASDummies();
+		clearAASAggregator();
+	}
+
 	@Test
 	public void testCreateAndGetAAS() {
 		IAASAggregator aggregator = getAggregator();