[jboss-svn-commits] JBL Code SVN: r8294 - in labs/jbossesb/trunk: product/core/rosetta/src/org/jboss/internal/soa/esb/couriers product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests qa/junit/src/org/jboss/soa/esb/listeners/gateway
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 13 12:31:18 EST 2006
Author: kevin.conner at jboss.com
Date: 2006-12-13 12:31:04 -0500 (Wed, 13 Dec 2006)
New Revision: 8294
Removed:
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfigWindows.xml
Modified:
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfig.xml
Log:
Fixed tests relying on specific hierarchy
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2006-12-13 17:28:03 UTC (rev 8293)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2006-12-13 17:31:04 UTC (rev 8294)
@@ -320,8 +320,7 @@
return new File(dir,input.getName()+sfx);
} //________________________________
- protected static final String DEFAULT_TMP
- = (System.getProperty("os.name").toLowerCase().contains("window")) ? "/temp" : "/tmp";
+ protected static final String DEFAULT_TMP = System.getProperty("java.io.tmpdir");
protected String _outputSuffix;
protected URL _url;
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java 2006-12-13 17:28:03 UTC (rev 8293)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java 2006-12-13 17:31:04 UTC (rev 8294)
@@ -53,10 +53,7 @@
public class FileCourierUnitTest
{
private static Logger _logger = Logger.getLogger(FileCourierUnitTest.class);
- private static final String DEFAULT_TEMP =
- (System.getProperty("os.name").toLowerCase().contains("window")) ? "/temp" : "/tmp";
-// private static final String TMP_DIR = System.getProperty("java.io.tmpdir",DEFAULT_TEMP);
- private static final String TMP_DIR = DEFAULT_TEMP;
+ private static final String TMP_DIR = System.getProperty("java.io.tmpdir");
static File _tmpDir = new File(TMP_DIR);
static String TEST_SUFFIX = ".testMessage";
@@ -109,7 +106,7 @@
String contents = "This is the text that travels in the Message body";
// toEpr for files must be a directory
- FileEpr toEpr = new FileEpr("file://"+TMP_DIR);
+ FileEpr toEpr = new FileEpr(_tmpDir.toURL());
// FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
toEpr.setPostSuffix(TEST_SUFFIX);
@@ -151,7 +148,7 @@
String contents = "This is the text that travels in the Message body";
// toEpr for files must be a directory
- FileEpr toEpr = new FileEpr("file://"+TMP_DIR);
+ FileEpr toEpr = new FileEpr(_tmpDir.toURL());
// FileEpr uses the postSuffix as the extension for messages delivered (default = ".esbMessage")
toEpr.setPostSuffix(TEST_SUFFIX);
@@ -203,7 +200,7 @@
Assert.assertTrue(theFile.exists());
_logger.info("Invalid Message file "+theFile.toString()+" successfully created");
- FileEpr fromEpr = new FileEpr("file:"+TMP_DIR);
+ FileEpr fromEpr = new FileEpr(_tmpDir.toURL()) ;
fromEpr.setInputSuffix(TEST_SUFFIX);
fromEpr.setPostSuffix(DONE_SUFFIX);
fromEpr.setErrorSuffix(ERROR_SUFFIX);
@@ -232,7 +229,7 @@
Assert.assertTrue(theFile.exists());
_logger.info("Invalid Message file "+theFile.toString()+" successfully created");
- FileEpr fromEpr = new FileEpr("file://"+TMP_DIR);
+ FileEpr fromEpr = new FileEpr(_tmpDir.toURL());
fromEpr.setInputSuffix(TEST_SUFFIX);
fromEpr.setPostSuffix(DONE_SUFFIX);
fromEpr.setErrorSuffix(ERROR_SUFFIX);
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java 2006-12-13 17:28:03 UTC (rev 8293)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java 2006-12-13 17:31:04 UTC (rev 8294)
@@ -51,11 +51,7 @@
{
EmailEpr email = new EmailEpr(EmailEpr.SMTP_PROTOCOL, "foobar", "25", "me", "letmein");
- String tmpDir = "/tmp";
- String os = System.getProperty("os.name").toLowerCase();
- if (os.indexOf("windows")>=0) {
- tmpDir="/Temp";
- }
+ String tmpDir = System.getProperty("java.io.tmpdir");
EPRManager manager = EPRManager.getInstance(tmpDir);
try
@@ -79,11 +75,7 @@
{
EmailEpr email = new EmailEpr(EmailEpr.SMTP_PROTOCOL, "foobar", "25", "me", "letmein");
- String tmpDir = "/tmp";
- String os = System.getProperty("os.name").toLowerCase();
- if (os.indexOf("windows")>=0) {
- tmpDir="/Temp";
- }
+ String tmpDir = System.getProperty("java.io.tmpdir");
EPRManager manager = EPRManager.getInstance(tmpDir);
try
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java 2006-12-13 17:28:03 UTC (rev 8293)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java 2006-12-13 17:31:04 UTC (rev 8294)
@@ -40,6 +40,7 @@
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.message.EsbListenerController;
import org.jboss.soa.esb.listeners.message.EsbListenerControllerFactory;
import org.jboss.soa.esb.message.Message;
@@ -58,7 +59,7 @@
static String _gatewayConfig = "fileGatewayConfig.xml";
static String _esbListenerConfig = "fileEsbListenerConfig.xml";
- private static final String TMP_DIR= System.getProperty("os.name").toLowerCase().contains("windows")?"/temp":"/tmp";
+ private static final String TMP_DIR= System.getProperty("java.io.tmpdir");
static File _returnFile = new File(TMP_DIR,"fileMessageBack.txt");
static File _droppedFile = new File(TMP_DIR,"fileLegacy.dat");
static String POST_SUFFIX = ".sentToEsb";
@@ -88,12 +89,6 @@
// initialize registry
runBeforeAllTests();
-
- String os = System.getProperty("os.name").toLowerCase();
- if (os.indexOf("windows")>=0)
- {
- _gatewayConfig = "fileGatewayConfigWindows.xml";
- }
}
@AfterClass
@@ -116,6 +111,7 @@
inStream = getClass().getResourceAsStream(_gatewayConfig);
tree = ConfigTree.fromInputStream(inStream);
+ tree.getFirstChild("GatewayConfig").setAttribute(ListenerTagNames.FILE_INPUT_DIR_TAG, TMP_DIR);
_gatewayController = new GatewayListenerController(tree);
new Thread(_gatewayController).start();
Thread.sleep(4000);
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfig.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfig.xml 2006-12-13 17:28:03 UTC (rev 8293)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfig.xml 2006-12-13 17:31:04 UTC (rev 8294)
@@ -4,7 +4,7 @@
target-service-name="testFileGateway"
gatewayClass="org.jboss.soa.esb.listeners.gateway.FileGatewayListener"
pollLatencySeconds="5"
- inputDir="/tmp"
+ inputDir="Added by UNIT test"
inputSuffix=".dat"
postSuffix=".sentToEsb"
>
Deleted: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfigWindows.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfigWindows.xml 2006-12-13 17:28:03 UTC (rev 8293)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/fileGatewayConfigWindows.xml 2006-12-13 17:31:04 UTC (rev 8294)
@@ -1,12 +0,0 @@
-<FileGateway parameterReloadSecs="180">
- <GatewayConfig
- target-service-category="myCategory"
- target-service-name="testFileGateway"
- gatewayClass="org.jboss.soa.esb.listeners.gateway.FileGatewayListener"
- pollLatencySeconds="5"
- inputDir="/temp"
- inputSuffix=".dat"
- postSuffix=".sentToEsb"
- >
- </GatewayConfig>
-</FileGateway>
More information about the jboss-svn-commits
mailing list