[FABCJ-214] - Java chaincode gRPC server

clean env in ChaincodeSupportClientTest, remove "stupid" debug

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

Author: oyamkovyi

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java

@@ -41,8 +41,6 @@ public void testCreateFailsWithoutValidOptions() {
         thrown.expectMessage(containsString(
             "The chaincode id must be specified using either the -i or --i command line options or the CORE_CHAINCODE_ID_NAME environment variable."));
 
-        System.out.println("CORE_CHAINCODE_NAME = " + System.getenv("CORE_CHAINCODE_ID_NAME"));
-
         @SuppressWarnings("unused")
         final ContractRouter r = new ContractRouter(new String[] {});
     }

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

@@ -193,9 +193,6 @@ public void testUnsetOptionClientCertPath() {
         environmentVariables.set("CORE_CHAINCODE_ID_NAME", "mycc");
         environmentVariables.set("CORE_PEER_TLS_ENABLED", "true");
         cb.processEnvironmentOptions();
-
-        System.out.println("CORE_TLS_CLIENT_CERT_PATH = " + System.getenv("CORE_TLS_CLIENT_CERT_PATH"));
-
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage(Matchers.containsString("Client key certificate chain"));
         cb.validateOptions();
@@ -208,9 +205,6 @@ public void testUnsetOptionClientKeyPath() {
         environmentVariables.set("CORE_PEER_TLS_ENABLED", "true");
         environmentVariables.set("CORE_TLS_CLIENT_CERT_PATH", "non_exist_path3");
         cb.processEnvironmentOptions();
-
-        System.out.println("CORE_TLS_CLIENT_KEY_PATH = " + System.getenv("CORE_TLS_CLIENT_KEY_PATH"));
-
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage(Matchers.containsString("Client key ("));
         cb.validateOptions();
@@ -273,9 +267,6 @@ public void testStartFailsWithoutValidOptions() {
         ArgumentCaptor<LogRecord> argumentCaptor = ArgumentCaptor.forClass(LogRecord.class);
         Logger logger = Logger.getLogger("org.hyperledger.fabric.shim.ChaincodeBase");
         logger.addHandler(mockHandler);
-
-        System.out.println("CORE_CHAINCODE_NAME = " + System.getenv("CORE_CHAINCODE_ID_NAME"));
-
         cb.start(args);
 
         Mockito.verify(mockHandler, Mockito.atLeast(1)).publish(argumentCaptor.capture());

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

@@ -12,6 +12,7 @@
 import org.hyperledger.fabric.protos.peer.ChaincodeShim;
 import org.hyperledger.fabric.shim.ChaincodeBase;
 import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.jupiter.api.Assertions;
@@ -24,6 +25,11 @@ class ChaincodeSupportClientTest {
     @Rule
     public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
 
+    @After
+    public void cleanEnv() {
+        environmentVariables.clear("CORE_CHAINCODE_ID_NAME");
+    }
+
     @Test
     void testStartInvocationTaskManagerAndRequestObserverNull() throws IOException {
         environmentVariables.set("CORE_CHAINCODE_ID_NAME", "mycc");