Author: ieugen
Date: Mon Mar 12 00:31:34 2012
New Revision: 1299501
URL: http://svn.apache.org/viewvc?rev=1299501&view=rev
Log:
JAMES-1393
- updated tests to juni 4.x style
- added @Override and reformated code
Issue #JAMES-1393 - Upgrate all test suites to junit 4.10
Modified:
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
Modified:
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java?rev=1299501&r1=1299500&r2=1299501&view=diff
==============================================================================
---
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
(original)
+++
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
Mon Mar 12 00:31:34 2012
@@ -22,70 +22,71 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.james.filesystem.api.FileSystem;
public class ActiveMQMailQueueBlobTest extends ActiveMQMailQueueTest {
- public final static String BASE_DIR = "file://target/james-test";
+ public final static String BASE_DIR = "file://target/james-test";
private MyFileSystem fs;
+ @Override
protected ActiveMQConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory factory = super.createConnectionFactory();
+ ActiveMQConnectionFactory factory = super.createConnectionFactory();
- FileSystemBlobTransferPolicy policy = new
FileSystemBlobTransferPolicy();
- policy.setFileSystem(fs);
- policy.setDefaultUploadUrl(BASE_DIR);
- factory.setBlobTransferPolicy(policy);
+ FileSystemBlobTransferPolicy policy = new
FileSystemBlobTransferPolicy();
+ policy.setFileSystem(fs);
+ policy.setDefaultUploadUrl(BASE_DIR);
+ factory.setBlobTransferPolicy(policy);
- return factory;
+ return factory;
}
@Override
public void setUp() throws Exception {
- fs = new MyFileSystem();
-
- super.setUp();
+ fs = new MyFileSystem();
+ super.setUp();
}
@Override
- protected void tearDown() throws Exception {
- super.tearDown();
- if (fs != null) {
- fs.destroy();
- }
+ public void tearDown() throws Exception {
+ super.tearDown();
+ if (fs != null) {
+ fs.destroy();
+ }
}
@Override
protected boolean useBlobMessages() {
- return true;
+ return true;
}
private final class MyFileSystem implements FileSystem {
- public InputStream getResource(String url) throws IOException {
- return null;
- }
-
- public File getFile(String fileURL) throws FileNotFoundException {
- if (fileURL.startsWith("file://")) {
- return new File(fileURL.substring("file://".length()));
-
- } else if (fileURL.startsWith("file:/")) {
- return new File(fileURL.substring("file:".length()));
-
- }
- throw new FileNotFoundException();
- }
-
- public File getBasedir() throws FileNotFoundException {
- throw new FileNotFoundException();
- }
-
- public void destroy() throws FileNotFoundException {
- getFile(BASE_DIR).delete();
- }
+ @Override
+ public InputStream getResource(String url) throws IOException {
+ return null;
+ }
+
+ @Override
+ public File getFile(String fileURL) throws FileNotFoundException {
+ if (fileURL.startsWith("file://")) {
+ return new File(fileURL.substring("file://".length()));
+
+ } else if (fileURL.startsWith("file:/")) {
+ return new File(fileURL.substring("file:".length()));
+
+ }
+ throw new FileNotFoundException();
+ }
+
+ @Override
+ public File getBasedir() throws FileNotFoundException {
+ throw new FileNotFoundException();
+ }
+
+ public void destroy() throws FileNotFoundException {
+ getFile(BASE_DIR).delete();
+ }
}
-
}
Modified:
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java?rev=1299501&r1=1299500&r2=1299501&view=diff
==============================================================================
---
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
(original)
+++
james/server/trunk/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
Mon Mar 12 00:31:34 2012
@@ -19,7 +19,6 @@
package org.apache.james.queue.activemq;
import javax.jms.ConnectionFactory;
-
import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.plugin.StatisticsBrokerPlugin;
@@ -45,8 +44,8 @@ public class ActiveMQMailQueueTest exten
Logger log = LoggerFactory.getLogger("MockLog");
// slf4j can't set programmatically any log level. It's just a facade
// log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
- ActiveMQMailQueue queue = new ActiveMQMailQueue(factory, queueName,
useBlobMessages(), log);
- return queue;
+ ActiveMQMailQueue localQueue = new ActiveMQMailQueue(factory,
queueName, useBlobMessages(), log);
+ return localQueue;
}
protected boolean useBlobMessages() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
