QPID-1384: Changed for storing UTF8 Strings in files

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@710075 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 21 insertions, 4 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
new file mode 100644
index 0000000000..c9734b1988
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
@@ -0,0 +1,4 @@
+exhangeName
+queueName
+routingkey
+data
\ No newline at end of file
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
new file mode 100644
index 0000000000..ae10752dab
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
@@ -0,0 +1,4 @@
+設定がそのように構成されていなければな
+的某些更新没有出现在这个 README 中。你可以访问下面的
+的发行版本包括多张光盘，其中包括安装光盘和源码光盘
+目のインストール CD は、ほとんどの最近のシス
\ No newline at end of file
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
index 35418a4101..39ecf0a209 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import javax.naming.InitialContext;
 import javax.jms.*;
 import java.util.Properties;
+import java.io.*;
 
 
 /**
@@ -46,15 +47,24 @@ public class UTF8Test extends QpidTestCase
 
     public void testPlainEn() throws Exception
     {
-        runTest("exhangeName", "queueName", "routingkey", "data");
+         invoke("UTF8En");
     }
 
 
     public void testUTF8Jp() throws Exception
     {
-        runTest("設定がそのように構成されていなければな", "的某些更新没有出现在这个 README 中。你可以访问下面的", "的发行版本包括多张光盘，其中包括安装光盘和源码光盘", "目のインストール CD は、ほとんどの最近のシス");
+        invoke("UTF8Jp");
     }
 
+
+    private void invoke(String name) throws Exception
+    {
+        String path = System.getProperties().getProperty("QPID_HOME");
+        path = path + "/../systests/src/main/java/org/apache/qpid/test/unit/message/" + name;
+         BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF8"));
+        runTest(in.readLine(), in.readLine(), in.readLine(), in.readLine());
+        in.close();
+    }
     private void runTest(String exchangeName, String queueName, String routingKey, String data) throws Exception
     {
         _logger.info("Running test for exchange: " + exchangeName
@@ -94,8 +104,7 @@ public class UTF8Test extends QpidTestCase
             sess.queueDeclare(qname, null, null);
             sess.exchangeBind(qname, exch, routkey, null);
             sess.sync();
-
-            conn.close();
+            conn.close();        
     }
 
     private Destination getDestination(String exch, String routkey, String qname)