Minor changes for linux environment problems.

Jagrut Kosti · Jagrut Kosti · commit 0796ea3e8305 · 2017-07-19T14:31:55.000+09:00
diff --git a/src/main/java/multichain/command/builders/QueryBuilderAddress.java b/src/main/java/multichain/command/builders/QueryBuilderAddress.java
@@ -244,7 +244,7 @@ protected static String executeImportAddress(String address, String label, boole
 	 */
 	protected static String executeValidateAddress(String address) throws MultichainException, MultichainException {
 		MultichainTestParameter.isNotNullOrEmpty("address", address);
-		return execute(CommandEnum.VALIDATEADDRESS, formatJson(address));
+		return execute(CommandEnum.VALIDATEADDRESS, address);
 	}
 
 
diff --git a/src/main/java/multichain/command/builders/QueryBuilderCommon.java b/src/main/java/multichain/command/builders/QueryBuilderCommon.java
@@ -164,6 +164,10 @@ protected static String execute(CommandEnum command, String... parameters) throw
 				outputGobbler.start();
 
 				pr.waitFor();
+
+				errorGobbler.join();
+				outputGobbler.join();
+
 				pr.getOutputStream().close();
 				if(outputGobbler.output.length() > 0)
 					return outputGobbler.output.toString();
@@ -258,12 +262,12 @@ protected static String formatStringArrayOS(String[] values){
 			valuesParam += "]";
 			return valuesParam;
 		} else {
-			String valuesParam = "'[";
+			String valuesParam = "[";
 			for(int j = 0; j < values.length; j++) {
 				valuesParam += (j != values.length - 1) ?  ("\"" + values[j] + "\",") :
 						("\"" + values[j] + "\"");
 			}
-			valuesParam += "]'";
+			valuesParam += "]";
 			return valuesParam;
 		}
 	}
diff --git a/src/test/java/command/CommandTest.java b/src/test/java/command/CommandTest.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import multichain.command.*;
+import multichain.object.Address;
 import multichain.object.Stream;
 import multichain.object.StreamItem;
 import multichain.object.StreamKeyPublisherInfo;
@@ -159,6 +160,16 @@ private static void testListStreamPublishers() {
 			e.printStackTrace();
 		}
 	}
+
+	private static void testGetNewAddress() {
+		try {
+			Address addr = AddressCommand.getNewAddress();
+			System.out.println(addr.getAddress());
+		} catch (MultichainException e) {
+			e.printStackTrace();
+		}
+	}
+
 	/**
 	 * @param args
 	 */
@@ -169,8 +180,8 @@ public static void main(String[] args) {
 		ChainCommand.initializeChain("plagchain");
 		//testgetAddresses();
 		//testCreateStream();
-		//testListStreams();
-		testPublishStream();
+		testListStreams();
+		//testPublishStream();
 		//testSubscribe();
 		//testUnsubscribe();
 		//testGetStreamItem();
@@ -179,6 +190,7 @@ public static void main(String[] args) {
 		//testListStreamItems();
 		//testListStreamPublisherItems();
 		//testListStreamPublishers();
+		//testGetNewAddress();
 		System.out.println("--- End of CommandTest ---");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ protected static String executeImportAddress(String address, String label, boole`
`244`	`244`	`*/`
`245`	`245`	`protected static String executeValidateAddress(String address) throws MultichainException, MultichainException {`
`246`	`246`	`MultichainTestParameter.isNotNullOrEmpty("address", address);`
`247`		`- return execute(CommandEnum.VALIDATEADDRESS, formatJson(address));`
	`247`	`+ return execute(CommandEnum.VALIDATEADDRESS, address);`
`248`	`248`	`}`
`249`	`249`
`250`	`250`