You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/24 01:49:18 UTC
svn commit: r1525749 - in /qpid/trunk/qpid/java:
qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
Author: robbie
Date: Mon Sep 23 23:49:17 2013
New Revision: 1525749
URL: http://svn.apache.org/r1525749
Log:
QPID-5161: make UTF8Test use the resources in the jar instead of searching for it on the filesystem
Modified:
qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
Modified: qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java?rev=1525749&r1=1525748&r2=1525749&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java (original)
+++ qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java Mon Sep 23 23:49:17 2013
@@ -201,6 +201,11 @@ public class TestFileUtils
*/
public static void copy(InputStream in, File dst) throws IOException
{
+ if(in == null)
+ {
+ throw new IllegalArgumentException("Provided InputStream must not be null");
+ }
+
try
{
if (!dst.exists())
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java?rev=1525749&r1=1525748&r2=1525749&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java Mon Sep 23 23:49:17 2013
@@ -30,7 +30,7 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.InitialContext;
import java.io.BufferedReader;
-import java.io.FileInputStream;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
@@ -56,9 +56,9 @@ public class UTF8Test extends QpidBroker
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"));
+ InputStream stream = getClass().getClassLoader().getResourceAsStream("org/apache/qpid/test/unit/message/" + name);
+
+ BufferedReader in = new BufferedReader(new InputStreamReader(stream, "UTF8"));
runTest(in.readLine(), in.readLine(), in.readLine(), in.readLine());
in.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org