nit: Fix test cases

Signed-off-by: Bilyana Gospodinova <bilyana.gospodinova14@gmail.com>
hashgraph · Mar 14, 2024 · 2e9648f · 2e9648f
1 parent 4d72bf7
commit 2e9648f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/...or-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/EquivalenceFeature.java b/...or-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/EquivalenceFeature.java
@@ -201,7 +201,12 @@ public void selfDestructAndSetBeneficiaryToDeletedContract() {
 
     @Given("I successfully create fungible token for internal calls tests")
     public void createFungibleToken() {
-        fungibleTokenId = tokenClient.getToken(FUNGIBLE).tokenId();
+        var tokenResponse = tokenClient.getToken(FUNGIBLE);
+        if (tokenResponse.response() != null) {
+            fungibleTokenId = tokenResponse.tokenId();
+            networkTransactionResponse = tokenResponse.response();
+            verifyMirrorTransactionsResponse(mirrorClient, 200);
+        }
     }
 
     @Then("I make internal {string} to system account {string} {string} amount")
@@ -267,11 +272,15 @@ private void validateMirrorNodeCallCodeResponseToSystemAccount(long accountNumbe
         var returnedDataBytes = response.contractCallResponse().getResultAsBytes();
         if (amount == null) {
             // Should succeed
-            assertArrayEquals(new byte[0], returnedDataBytes.toArray());
+            if (accountNumber > 0 && accountNumber <= 9) {
+                assertArrayEquals(functionParameterData, response.contractCallResponse().getResultAsBytes().trimTrailingZeros().toArray());
+            } else {
+                assertArrayEquals(new byte[0], returnedDataBytes.toArray());
+            }
         } else {
             if (shouldSystemAccountWithAmountReturnInvalidFeeSubmitted(accountNumber)) {
                 // Should fail
-                assertArrayEquals(functionParameterData, returnedDataBytes.trimTrailingZeros().toArray());
+                // TODO: add the assert when we know how the error will be returned
             } else {
                 // Should succeed
                 assertArrayEquals(new byte[0], returnedDataBytes.toArray());

diff --git a/hedera-mirror-test/src/test/resources/features/contract/equivalence.feature b/hedera-mirror-test/src/test/resources/features/contract/equivalence.feature
@@ -34,31 +34,30 @@ Feature: in-equivalence tests
   Scenario Outline: Validate in-equivalence tests for system accounts with call, staticcall, delegatecall
   and callcode
     Given I successfully create equivalence call contract
-    Then the mirror node REST API should return status 200 for the contracts creation
     Then I verify the equivalence contract bytecode is deployed
     Given I successfully create fungible token for internal calls tests
     Then I make internal <callType> to system account <account> <amountType> amount
 
     Examples:
       | callType       | account   | amountType |
       | "call"         | "0.0.0"   | "without"  |
-#      | "call"         | "0.0.0"   | "with"     |
+#      | "call"         | "0.0.0"   | "with"     | fails
       | "call"         | "0.0.4"   | "without"  |
-#      | "call"         | "0.0.4"   | "with"     |
+#      | "call"         | "0.0.4"   | "with"     | fails
       | "call"         | "0.0.100" | "without"  |
-#      | "call"         | "0.0.100" | "with"     |
+#      | "call"         | "0.0.100" | "with"     | fails
       | "call"         | "0.0.358" | "without"  |
-#      | "call"         | "0.0.358" | "with"     |
-#      | "call"         | "0.0.359" | "without"  |
-#      | "call"         | "0.0.359" | "with"     |
+#      | "call"         | "0.0.358" | "with"     | fails
+      | "call"         | "0.0.359" | "without"  |
+#      | "call"         | "0.0.359" | "with"     | fails
       | "call"         | "0.0.741" | "without"  |
-#      | "call"         | "0.0.741" | "with"     |
+#      | "call"         | "0.0.741" | "with"     | fails
       | "call"         | "0.0.800" | "without"  |
       | "call"         | "0.0.800" | "with"     |
       | "staticcall"   | "0.0.0"   | "without"  |
       | "staticcall"   | "0.0.4"   | "without"  |
       | "staticcall"   | "0.0.358" | "without"  |
-#      | "staticcall"   | "0.0.359" | "without"  |
+      | "staticcall"   | "0.0.359" | "without"  |
       | "staticcall"   | "0.0.741" | "without"  |
       | "staticcall"   | "0.0.800" | "without"  |
       | "delegatecall" | "0.0.0"   | "without"  |
@@ -68,12 +67,12 @@ Feature: in-equivalence tests
       | "delegatecall" | "0.0.741" | "without"  |
       | "delegatecall" | "0.0.800" | "without"  |
       | "callcode"     | "0.0.0"   | "without"  |
-#      | "callcode"     | "0.0.0"   | "with"     |
-#      | "callcode"     | "0.0.4"   | "without"  |
-      | "callcode"     | "0.0.4"   | "with"     |
+#      | "callcode"     | "0.0.0"   | "with"     | fails
+      | "callcode"     | "0.0.4"   | "without"  |
+#      | "callcode"     | "0.0.4"   | "with"     | add assertion
       | "callcode"     | "0.0.358" | "without"  |
-#      | "callcode"     | "0.0.358" | "with"     |
+#      | "callcode"     | "0.0.358" | "with"     | fails
       | "callcode"     | "0.0.741" | "without"  |
-#      | "callcode"     | "0.0.741" | "with"     |
+#      | "callcode"     | "0.0.741" | "with"     | fails
       | "callcode"     | "0.0.800" | "without"  |
       | "callcode"     | "0.0.800" | "with"     |