8:02 a.m.
Author: borges
Date: 2011-05-12 09:02:52 -0400 (Thu, 12 May 2011)
New Revision: 10643
Added:
trunk/tests/joram-tests/src/test/resources/
trunk/tests/joram-tests/src/test/resources/provider.properties
trunk/tests/joram-tests/src/test/resources/test.properties
Removed:
trunk/tests/joram-tests/config/provider.properties
trunk/tests/joram-tests/config/test.properties
Modified:
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java
Log:
Fix ObjectWeb Joram tests set-up
Deleted: trunk/tests/joram-tests/config/provider.properties
===================================================================
--- trunk/tests/joram-tests/config/provider.properties 2011-05-12 13:01:53 UTC (rev
10642)
+++ trunk/tests/joram-tests/config/provider.properties 2011-05-12 13:02:52 UTC (rev
10643)
@@ -1,36 +0,0 @@
-##
-# JORAM: Java(TM) Open Reliable Asynchronous Messaging
-# Copyright (C) 2002 INRIA
-# Contact: joram-team(a)objectweb.org
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
-# Contributor(s): ______________________________________.
-##
-
-##
-# This property is used to chose which provider is to be tested
-# Uncomment the chosen provider and comment the other ones
-##
-
-jms.provider.admin.class=org.hornetq.jms.HornetQAdmin
-#jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.FioranoMQAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.PramatiAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.SwiftMQAdmin
\ No newline at end of file
Deleted: trunk/tests/joram-tests/config/test.properties
===================================================================
--- trunk/tests/joram-tests/config/test.properties 2011-05-12 13:01:53 UTC (rev 10642)
+++ trunk/tests/joram-tests/config/test.properties 2011-05-12 13:02:52 UTC (rev 10643)
@@ -1,29 +0,0 @@
-##
-# JORAM: Java(TM) Open Reliable Asynchronous Messaging
-# Copyright (C) 2002 INRIA
-# Contact: joram-team(a)objectweb.org
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
-# Contributor(s): ______________________________________.
-##
-
-# Timeout specified for receive(long time) method
-# Time in milliseconds or 0 for never expiring
-# Default is set to 30 seconds (long enough to receive slow messages
-# and won't hang up tests infinitely)
-timeout = 30000
\ No newline at end of file
Modified:
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
===================================================================
---
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2011-05-12
13:01:53 UTC (rev 10642)
+++
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2011-05-12
13:02:52 UTC (rev 10643)
@@ -35,7 +35,7 @@
*/
public abstract class JMSTestCase extends TestCase
{
- private static final String PROP_FILE_NAME = "config/provider.properties";
+ private static final String PROP_FILE_NAME = "provider.properties";
protected Admin admin;
@@ -57,11 +57,11 @@
{
message += " [linked exception: " + linkedException +
"]";
}
- super.fail(message);
+ fail(message);
}
else
{
- super.fail(e.getMessage());
+ fail(e.getMessage());
}
}
Modified:
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java
===================================================================
---
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java 2011-05-12
13:01:53 UTC (rev 10642)
+++
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java 2011-05-12
13:02:52 UTC (rev 10643)
@@ -24,13 +24,13 @@
public class TestConfig
{
// name of the configuration file
- private static final String PROP_FILE_NAME = "config/test.properties";
+ private static final String PROP_FILE_NAME = "test.properties";
// name of the timeout property
private static final String PROP_NAME = "timeout";
/**
- * timeout value used by <code>receive</code> method in the tests.
+ * timeout value used by <code>receive</code> method in the tests.
* the value is specified in the <code>config/test.properties</code>
file.
*/
public static final long TIMEOUT;
Copied: trunk/tests/joram-tests/src/test/resources/provider.properties (from rev 10642,
trunk/tests/joram-tests/config/provider.properties)
===================================================================
--- trunk/tests/joram-tests/src/test/resources/provider.properties
(rev 0)
+++ trunk/tests/joram-tests/src/test/resources/provider.properties 2011-05-12 13:02:52 UTC
(rev 10643)
@@ -0,0 +1,36 @@
+##
+# JORAM: Java(TM) Open Reliable Asynchronous Messaging
+# Copyright (C) 2002 INRIA
+# Contact: joram-team(a)objectweb.org
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
+# Contributor(s): ______________________________________.
+##
+
+##
+# This property is used to chose which provider is to be tested
+# Uncomment the chosen provider and comment the other ones
+##
+
+jms.provider.admin.class=org.hornetq.jms.HornetQAdmin
+#jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.FioranoMQAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.PramatiAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.SwiftMQAdmin
\ No newline at end of file
Copied: trunk/tests/joram-tests/src/test/resources/test.properties (from rev 10642,
trunk/tests/joram-tests/config/test.properties)
===================================================================
--- trunk/tests/joram-tests/src/test/resources/test.properties
(rev 0)
+++ trunk/tests/joram-tests/src/test/resources/test.properties 2011-05-12 13:02:52 UTC
(rev 10643)
@@ -0,0 +1,29 @@
+##
+# JORAM: Java(TM) Open Reliable Asynchronous Messaging
+# Copyright (C) 2002 INRIA
+# Contact: joram-team(a)objectweb.org
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
+# Contributor(s): ______________________________________.
+##
+
+# Timeout specified for receive(long time) method
+# Time in milliseconds or 0 for never expiring
+# Default is set to 30 seconds (long enough to receive slow messages
+# and won't hang up tests infinitely)
+timeout = 30000
\ No newline at end of file