[FABCJ-214] - Java chaincode gRPC server

add cleaning for env variables in tests

Signed-off-by: Oleksandr Yamkovyi <[email protected]>

Author: oyamkovyi

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeBaseTest.java

@@ -33,6 +33,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
@@ -47,6 +48,16 @@ public class ChaincodeBaseTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
+    @AfterEach
+    void clearEnv() {
+        environmentVariables.clear("CORE_CHAINCODE_ID_NAME");
+        environmentVariables.clear("CORE_PEER_ADDRESS");
+        environmentVariables.clear("CORE_PEER_TLS_ENABLED");
+        environmentVariables.clear("CORE_PEER_TLS_ROOTCERT_FILE");
+        environmentVariables.clear("CORE_TLS_CLIENT_KEY_PATH");
+        environmentVariables.clear("CORE_TLS_CLIENT_CERT_PATH");
+    }
+
     @Test
     public void testNewSuccessResponseEmpty() {
         final org.hyperledger.fabric.shim.Chaincode.Response response = ResponseUtils.newSuccessResponse();

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InnvocationTaskManagerTest.java

@@ -14,6 +14,7 @@
 import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
 import org.junit.Rule;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,6 +39,16 @@ void setEnv() {
         environmentVariables.set("CORE_TLS_CLIENT_CERT_PATH", "src/test/resources/client.crt.enc");
     }
 
+    @AfterEach
+    void clearEnv() {
+        environmentVariables.clear("CORE_CHAINCODE_ID_NAME");
+        environmentVariables.clear("CORE_PEER_ADDRESS");
+        environmentVariables.clear("CORE_PEER_TLS_ENABLED");
+        environmentVariables.clear("CORE_PEER_TLS_ROOTCERT_FILE");
+        environmentVariables.clear("CORE_TLS_CLIENT_KEY_PATH");
+        environmentVariables.clear("CORE_TLS_CLIENT_CERT_PATH");
+    }
+
     @Test
     void getManager() throws IOException {