Fixed more tests

Signed-off-by: Ivan Malygin <[email protected]>

Author: imalygin

platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/MerkleDbDataSource.java

@@ -372,7 +372,6 @@ public MerkleDbDataSource(
 
         // Update count of open databases
         COUNT_OF_OPEN_DATABASES.increment();
-        new Exception().printStackTrace();
 
         logger.info(
                 MERKLE_DB.getMarker(),

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/SignedStateFileReadWriteTest.java

@@ -116,6 +116,7 @@ void writeHashInfoFileTest() throws IOException {
 
         final String fileString = sb.toString();
         assertTrue(fileString.contains(hashInfoString), "hash info string not found");
+        state.release();
     }
 
     @Test
@@ -129,7 +130,7 @@ void writeThenReadStateFileTest() throws IOException {
         assertFalse(exists(signatureSetFile), "signature set file should not yet exist");
 
         State state = signedState.getState();
-        state.copy();
+        state.copy().release();
         TestMerkleCryptoFactory.getInstance().digestTreeSync(((TestMerkleStateRoot) state).getRoot());
         state.createSnapshot(testDirectory);
         writeSignatureSetFile(testDirectory, signedState);
@@ -156,6 +157,8 @@ void writeThenReadStateFileTest() throws IOException {
                 deserializedSignedState.reservedSignedState().get().getState().getHash(),
                 "hash should match");
         assertNotSame(signedState, deserializedSignedState.reservedSignedState(), "state should be a different object");
+        signedState.getState().release();
+        deserializedSignedState.reservedSignedState().get().getState().release();
     }
 
     @Test
@@ -180,7 +183,7 @@ void writeSavedStateToDiskTest() throws IOException {
                 .build();
 
         // make immutable
-        signedState.getState().copy();
+        signedState.getState().copy().release();
         TestMerkleCryptoFactory.getInstance().digestTreeSync((signedState.getState()).getRoot());
 
         writeSignedStateToDisk(

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/StateFileManagerTests.java

@@ -151,19 +151,16 @@ private void validateSavingOfState(final SignedState originalState, final Path s
                 TestPlatformContextBuilder.create().build().getConfiguration();
         final DeserializedSignedState deserializedSignedState =
                 readStateFile(stateFile, TEST_PLATFORM_STATE_FACADE, PlatformContext.create(configuration));
-        hashState(deserializedSignedState.reservedSignedState().get().getState());
+        SignedState signedState = deserializedSignedState.reservedSignedState().get();
+        hashState(signedState.getState());
 
         assertNotNull(deserializedSignedState.originalHash(), "hash should not be null");
-        assertNotSame(
-                deserializedSignedState.reservedSignedState().get(),
-                originalState,
-                "deserialized object should not be the same");
-
-        assertEquals(
-                originalState.getState().getHash(),
-                deserializedSignedState.reservedSignedState().get().getState().getHash(),
-                "hash should match");
+        assertNotSame(signedState, originalState, "deserialized object should not be the same");
+
+        assertEquals(originalState.getState().getHash(), signedState.getState().getHash(), "hash should match");
         assertEquals(originalState.getState().getHash(), deserializedSignedState.originalHash(), "hash should match");
+
+        signedState.getState().release();
     }
 
     @ParameterizedTest
@@ -475,6 +472,6 @@ private static void hashState(MerkleNodeState state) {
     }
 
     private static void makeImmutable(SignedState signedState) {
-        signedState.getState().copy();
+        signedState.getState().copy().release();
     }
 }

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/reconnect/DefaultSignedStateValidatorTests.java

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.swirlds.platform.reconnect;
 
+import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals;
 import static com.swirlds.common.utility.Threshold.MAJORITY;
 import static com.swirlds.platform.test.fixtures.state.TestPlatformStateFacade.TEST_PLATFORM_STATE_FACADE;
 import static org.hiero.base.crypto.test.fixtures.CryptoRandomUtils.randomHash;
@@ -13,13 +14,16 @@
 import com.swirlds.common.test.fixtures.Randotron;
 import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder;
 import com.swirlds.merkledb.MerkleDb;
+import com.swirlds.merkledb.MerkleDbDataSource;
 import com.swirlds.platform.crypto.SignatureVerifier;
 import com.swirlds.platform.state.signed.SignedState;
 import com.swirlds.platform.state.signed.SignedStateInvalidException;
 import com.swirlds.platform.state.signed.SignedStateValidationData;
 import com.swirlds.platform.test.fixtures.addressbook.RandomRosterEntryBuilder;
 import com.swirlds.platform.test.fixtures.state.RandomSignedStateGenerator;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -247,6 +251,11 @@ void setUp() {
     @AfterEach
     void tearDown() {
         RandomSignedStateGenerator.releaseAllBuiltSignedStates();
+        assertEventuallyEquals(
+                0L,
+                MerkleDbDataSource::getCountOfOpenDatabases,
+                Duration.of(5, ChronoUnit.SECONDS),
+                "All databases should be closed");
     }
 
     @ParameterizedTest

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/reconnect/RandomVirtualMapReconnectTests.java

@@ -51,7 +51,6 @@
 import java.util.stream.Stream;
 import org.hiero.base.crypto.DigestType;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -185,11 +184,6 @@ private static Stream<Arguments> buildArguments() {
         return arguments.stream();
     }
 
-    @BeforeAll
-    static void beforeAll() {
-        assertEquals(0, MerkleDbDataSource.getCountOfOpenDatabases());
-    }
-
     @ParameterizedTest
     @MethodSource("buildArguments")
     @DisplayName("Random Operations Reconnect Test")

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/state/IssDetectorTests.java

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.swirlds.platform.state;
 
+import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals;
 import static com.swirlds.common.utility.Threshold.MAJORITY;
 import static com.swirlds.common.utility.Threshold.SUPER_MAJORITY;
 import static com.swirlds.platform.state.RoundHashValidatorTests.generateCatastrophicNodeHashes;
@@ -23,6 +24,7 @@
 import com.swirlds.common.test.fixtures.GaussianWeightGenerator;
 import com.swirlds.common.test.fixtures.Randotron;
 import com.swirlds.common.test.fixtures.WeightGenerator;
+import com.swirlds.merkledb.MerkleDbDataSource;
 import com.swirlds.platform.consensus.ConsensusConfig;
 import com.swirlds.platform.state.iss.DefaultIssDetector;
 import com.swirlds.platform.state.iss.IssDetector;
@@ -33,6 +35,8 @@
 import com.swirlds.platform.test.fixtures.addressbook.RandomRosterBuilder;
 import com.swirlds.platform.test.fixtures.state.RandomSignedStateGenerator;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -47,6 +51,7 @@
 import org.hiero.consensus.model.notification.IssNotification.IssType;
 import org.hiero.consensus.model.transaction.ScopedSystemTransaction;
 import org.hiero.consensus.roster.RosterUtils;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -79,6 +84,7 @@ void stateReservationIsReleased() {
                 1,
                 stateWrapperForTest.get().getReservationCount(),
                 "The test caller should still have a reservation on the state");
+        stateWrapperForTest.get().getState().release();
     }
 
     @Test
@@ -635,6 +641,15 @@ void ignoredRoundTest() {
         assertMarkerFile(IssType.OTHER_ISS.toString(), false);
     }
 
+    @AfterEach
+    void tearDown() {
+        assertEventuallyEquals(
+                0L,
+                MerkleDbDataSource::getCountOfOpenDatabases,
+                Duration.of(5, ChronoUnit.SECONDS),
+                "All databases should be closed");
+    }
+
     private static Map<NodeId, ScopedSystemTransaction<StateSignatureTransaction>> generateSystemTransactions(
             final long roundNumber, @NonNull final RoundHashValidatorTests.HashGenerationData hashGenerationData) {
 

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/state/MerkleStateRootTest.java

@@ -922,4 +922,13 @@ void calculateHash_idempotent() {
             assertSame(hash1, hash2);
         }
     }
+
+    @AfterEach
+    void tearDown() {
+        assertEventuallyEquals(
+                0L,
+                MerkleDbDataSource::getCountOfOpenDatabases,
+                Duration.of(5, ChronoUnit.SECONDS),
+                "All databases should be closed");
+    }
 }

platform-sdk/swirlds-platform-core/src/testFixtures/java/com/swirlds/platform/test/fixtures/state/RandomSignedStateGenerator.java

@@ -46,6 +46,8 @@
 import java.util.Random;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.hiero.base.crypto.Hash;
 import org.hiero.base.crypto.Signature;
 import org.hiero.base.utility.CommonUtils;
@@ -58,6 +60,7 @@
  */
 public class RandomSignedStateGenerator {
 
+    private static final Logger logger = LogManager.getLogger(RandomSignedStateGenerator.class);
     /**
      * Signed states now use virtual maps which are heavy RAM consumers. They need to be released
      * in order to avoid producing OOMs when running tests. This list tracks all signed states
@@ -514,7 +517,7 @@ public static void releaseAllBuiltSignedStates() {
                     }
                 });
             } catch (Exception e) {
-
+                logger.error("Exception while releasing state", e);
             }
         });
         try {

platform-sdk/swirlds-state-impl/src/test/java/com/swirlds/state/merkle/disk/OnDiskWritableStateTest.java

@@ -6,6 +6,7 @@
 
 import com.hedera.pbj.runtime.ParseException;
 import com.swirlds.state.test.fixtures.merkle.MerkleTestBase;
+import com.swirlds.virtualmap.VirtualMap;
 import java.util.Spliterators;
 import java.util.stream.StreamSupport;
 import org.junit.jupiter.api.AfterEach;
@@ -229,7 +230,9 @@ void smorgasbord() throws ParseException {
             // Now let's make a fast copy and create a new state and make some more
             // modifications and reads. And then let's throw them all away and make
             // sure the virtual map hasn't changed.
+            final VirtualMap oldVirtualMap = fruitVirtualMap;
             fruitVirtualMap = fruitVirtualMap.copy();
+            oldVirtualMap.release();
             state = new OnDiskWritableKVState<>(FRUIT_STATE_KEY, STRING_CODEC, STRING_CODEC, fruitVirtualMap);
             assertThat(state.get(A_KEY)).isEqualTo(APPLE);
             state.remove(B_KEY);