results = template.selectList(SELECT_SYMMETRIC_KEYS_BY_MASTER_KEY,
+ entity, new RowBounds(0, maxResults));
+ return results;
+ }
+
+ @Override
+ public int countSymmetricKeysForMasterKeyAlias(String masterKeyAlias)
+ {
+ return (Integer)template.selectOne(COUNT_SYMMETRIC_KEYS_BY_MASTER_KEY, masterKeyAlias);
+ }
}
diff --git a/source/test-java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java b/source/test-java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
index 95d43b3335..9a2e858f59 100644
--- a/source/test-java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,6 +18,11 @@
*/
package org.alfresco.repo.content;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.ReadableByteChannel;
@@ -26,14 +31,19 @@ import java.util.Set;
import javax.transaction.UserTransaction;
-import junit.framework.TestCase;
-
import org.alfresco.repo.content.ContentStore.ContentUrlHandler;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.BaseApplicationContextHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
import org.springframework.context.ApplicationContext;
/**
@@ -44,14 +54,22 @@ import org.springframework.context.ApplicationContext;
* @see org.alfresco.service.cmr.repository.ContentReader
* @see org.alfresco.service.cmr.repository.ContentWriter
*
+ * @author sglover
* @author Derek Hulley
*/
-public abstract class AbstractReadOnlyContentStoreTest extends TestCase
+public abstract class AbstractReadOnlyContentStoreTest
{
- protected static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
-
+ protected static ApplicationContext ctx;
+
private static Log logger = LogFactory.getLog(AbstractReadOnlyContentStoreTest.class);
-
+
+ @Rule public TestName name = new TestName();
+
+ protected String getName()
+ {
+ return name.getMethodName();
+ }
+
protected TransactionService transactionService;
private UserTransaction txn;
@@ -60,11 +78,17 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
super();
}
+ @BeforeClass
+ public static void beforeClass() throws Exception
+ {
+ ctx = BaseApplicationContextHelper.getApplicationContext(ApplicationContextHelper.CONFIG_LOCATIONS);
+ }
+
/**
* Starts a transaction
*/
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
transactionService = (TransactionService) ctx.getBean("TransactionService");
txn = transactionService.getUserTransaction();
@@ -74,8 +98,8 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
/**
* Rolls back the transaction
*/
- @Override
- public void tearDown() throws Exception
+ @After
+ public void after() throws Exception
{
try { txn.rollback(); } catch (Throwable e) {e.printStackTrace();}
}
@@ -144,6 +168,7 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
}
}
+ @Test
public void testSetUp() throws Exception
{
// check that the store remains the same
@@ -182,6 +207,7 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
/**
* Checks that the error handling for inappropriate content URLs
*/
+ @Test
public void testIllegalReadableContentUrls()
{
ContentStore store = getStore();
@@ -193,13 +219,14 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
/**
* Checks that the various methods of obtaining a reader are supported.
*/
+ @Test
public void testGetReaderForExistingContentUrl() throws Exception
{
ContentStore store = getStore();
String contentUrl = getExistingContentUrl();
if (contentUrl == null)
{
- logger.warn("Store test " + getName() + " not possible on " + store.getClass().getName());
+ logger.warn("Store test testGetReaderForExistingContentUrl not possible on " + store.getClass().getName());
return;
}
// Get the reader
@@ -227,13 +254,14 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
*
* Only executes if the reader implements {@link RandomAccessContent}.
*/
+ @Test
public void testRandomAccessRead() throws Exception
{
ContentStore store = getStore();
String contentUrl = getExistingContentUrl();
if (contentUrl == null)
{
- logger.warn("Store test " + getName() + " not possible on " + store.getClass().getName());
+ logger.warn("Store test testRandomAccessRead not possible on " + store.getClass().getName());
return;
}
// Get the reader
@@ -256,6 +284,7 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
fileChannel.close();
}
+ @Test
public void testBlockedWriteOperations() throws Exception
{
ContentStore store = getStore();
@@ -277,7 +306,7 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
String contentUrl = getExistingContentUrl();
if (contentUrl == null)
{
- logger.warn("Store test " + getName() + " not possible on " + store.getClass().getName());
+ logger.warn("Store test testBlockedWriteOperations not possible on " + store.getClass().getName());
return;
}
// Ensure that we can't delete a URL
diff --git a/source/test-java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java b/source/test-java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
index 5e962c3c8a..0af8c7e54b 100644
--- a/source/test-java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,6 +18,12 @@
*/
package org.alfresco.repo.content;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -39,6 +45,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
/**
* Abstract base class that provides a set of tests for implementations
@@ -53,7 +60,7 @@ import org.apache.commons.logging.LogFactory;
@SuppressWarnings("deprecation")
public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyContentStoreTest
{
- private static Log logger = LogFactory.getLog(AbstractWritableContentStoreTest.class);
+ protected static Log logger = LogFactory.getLog(AbstractWritableContentStoreTest.class);
public AbstractWritableContentStoreTest()
{
@@ -68,7 +75,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
protected String getExistingContentUrl()
{
ContentWriter writer = getWriter();
- writer.putContent("Content for " + getName());
+ writer.putContent("Content for getExistingContentUrl");
return writer.getContentUrl();
}
@@ -84,7 +91,8 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
ContentStore store = getStore();
return store.getWriter(ContentStore.NEW_CONTENT_CONTEXT);
}
-
+
+ @Test
public void testSetUp() throws Exception
{
// check that the store remains the same
@@ -93,6 +101,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertTrue("The same instance of the store must be returned for getStore", store == getStore());
}
+ @Test
public void testWritable() throws Exception
{
ContentStore store = getStore();
@@ -102,6 +111,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Just checks that the method doesn't blow up
*/
+ @Test
public void testSpaceFree() throws Exception
{
ContentStore store = getStore();
@@ -111,6 +121,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Just checks that the method doesn't blow up
*/
+ @Test
public void testSpaceTotal() throws Exception
{
ContentStore store = getStore();
@@ -120,6 +131,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Just check that the method doesn't blow up
*/
+ @Test
public void testRootLocation() throws Exception
{
ContentStore store = getStore();
@@ -148,6 +160,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Checks that the error handling for inappropriate content URLs
*/
+ @Test
public void testIllegalWritableContentUrls()
{
ContentStore store = getStore();
@@ -159,10 +172,11 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Get a writer and write a little bit of content before reading it.
*/
+ @Test
public void testSimpleUse()
{
ContentStore store = getStore();
- String content = "Content for " + getName();
+ String content = "Content for testSimpleUse";
ContentWriter writer = store.getWriter(ContentStore.NEW_CONTENT_CONTEXT);
assertNotNull("Writer may not be null", writer);
@@ -186,6 +200,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Checks that the various methods of obtaining a reader are supported.
*/
+ @Test
public synchronized void testGetReader() throws Exception
{
ContentStore store = getStore();
@@ -200,7 +215,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
ContentReader readerFromWriterBeforeWrite = writer.getReader();
assertNotNull("A reader must always be available from the writer", readerFromWriterBeforeWrite);
- String content = "Content for " + getName();
+ String content = "Content for testGetReader";
// write some content
long before = System.currentTimeMillis();
@@ -255,6 +270,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
* Check that a reader is immutable, i.e. that a reader fetched before a
* write doesn't suddenly become aware of the content once it has been written.
*/
+ @Test
public void testReaderImmutability()
{
ContentWriter writer = getWriter();
@@ -264,7 +280,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertFalse(readerBeforeWrite.exists());
// Write some content
- writer.putContent("Content for " + getName());
+ writer.putContent("Content for testReaderImmutability");
assertFalse("Reader's state changed after write", readerBeforeWrite.exists());
try
{
@@ -281,6 +297,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertTrue("New reader after write should be directed to new content", readerAfterWrite.exists());
}
+ @Test
public void testMimetypAndEncodingAndLocale() throws Exception
{
ContentWriter writer = getWriter();
@@ -309,6 +326,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertEquals("Encoding and decoding of strings failed", content, contentCheck);
}
+ @Test
public void testClosedState() throws Exception
{
ContentWriter writer = getWriter();
@@ -375,11 +393,12 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
return found[0];
}
+ @Test
public void testDeleteSimple() throws Exception
{
ContentStore store = getStore();
ContentWriter writer = getWriter();
- writer.putContent("Content for " + getName());
+ writer.putContent("Content for testDeleteSimple");
String contentUrl = writer.getContentUrl();
assertTrue("Content must now exist", store.exists(contentUrl));
try
@@ -388,7 +407,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
}
catch (UnsupportedOperationException e)
{
- logger.warn("Store test " + getName() + " not possible on " + store.getClass().getName());
+ logger.warn("Store test testDeleteSimple not possible on " + store.getClass().getName());
return;
}
assertFalse("Content must now be removed", store.exists(contentUrl));
@@ -399,12 +418,13 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
*
* Only applies when {@link #getStore()} returns a value.
*/
+ @Test
public void testDeleteReaderStates() throws Exception
{
ContentStore store = getStore();
ContentWriter writer = getWriter();
- String content = "Content for " + getName();
+ String content = "Content for testDeleteReaderStates";
String contentUrl = writer.getContentUrl();
// write some bytes, but don't close the stream
@@ -481,6 +501,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
/**
* Checks that the writer can have a listener attached
*/
+ @Test
public void testWriteStreamListener() throws Exception
{
ContentWriter writer = getWriter();
@@ -507,6 +528,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
* If the resource accessed by {@link #getReader()} and {@link #getWriter()} is not the same, then
* values written and read won't be the same.
*/
+ @Test
public void testWriteAndReadString() throws Exception
{
ContentWriter writer = getWriter();
@@ -521,6 +543,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertEquals("Write and read didn't work", content, check);
}
+ @Test
public void testStringTruncation() throws Exception
{
String content = "1234567890";
@@ -537,11 +560,12 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertEquals("Truncated strings don't match", "12345", checkContent);
}
+ @Test
public void testReadAndWriteFile() throws Exception
{
ContentWriter writer = getWriter();
- File sourceFile = TempFileProvider.createTempFile(getName(), ".txt");
+ File sourceFile = TempFileProvider.createTempFile("testReadAndWriteFile", ".txt");
sourceFile.deleteOnExit();
// dump some content into the temp file
String content = "ABC";
@@ -555,7 +579,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertTrue("Stream close not detected", writer.isClosed());
// create a sink temp file
- File sinkFile = TempFileProvider.createTempFile(getName(), ".txt");
+ File sinkFile = TempFileProvider.createTempFile("testReadAndWriteFile", ".txt");
sinkFile.deleteOnExit();
// get the content into our temp file
@@ -573,6 +597,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertEquals("Write out of and read into files failed", content, check);
}
+ @Test
public void testReadAndWriteStreamByPull() throws Exception
{
ContentWriter writer = getWriter();
@@ -593,11 +618,12 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
assertEquals("Write out and read in using streams failed", content, check);
}
+ @Test
public void testReadAndWriteStreamByPush() throws Exception
{
ContentWriter writer = getWriter();
- String content = "ABC";
+ String content = "Some Random Content";
// get the content output stream
OutputStream os = writer.getContentOutputStream();
os.write(content.getBytes());
@@ -611,7 +637,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
InputStream is = reader.getContentInputStream();
byte[] buffer = new byte[100];
int count = is.read(buffer);
- assertEquals("No content read", 3, count);
+ assertEquals("No content read", content.length(), count);
is.close();
String check = new String(buffer, 0, count);
@@ -623,6 +649,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
*
* Only applies when {@link #getStore()} returns a value.
*/
+ @Test
public void testListUrls() throws Exception
{
ContentStore store = getStore();
@@ -633,7 +660,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
}
catch (UnsupportedOperationException e)
{
- logger.warn("Store test " + getName() + " not possible on " + store.getClass().getName());
+ logger.warn("Store test testListUrls not possible on " + store.getClass().getName());
return;
}
// Proceed with the test
@@ -662,6 +689,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
*
* Only executes if the writer implements {@link RandomAccessContent}.
*/
+ @Test
public void testRandomAccessWrite() throws Exception
{
ContentWriter writer = getWriter();
@@ -727,6 +755,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
*
* Only executes if the reader implements {@link RandomAccessContent}.
*/
+ @Test
public void testRandomAccessRead() throws Exception
{
ContentWriter writer = getWriter();
diff --git a/source/test-java/org/alfresco/repo/content/ContentFullContextTestSuite.java b/source/test-java/org/alfresco/repo/content/ContentFullContextTestSuite.java
index 506a621254..35f43dd31b 100644
--- a/source/test-java/org/alfresco/repo/content/ContentFullContextTestSuite.java
+++ b/source/test-java/org/alfresco/repo/content/ContentFullContextTestSuite.java
@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.content;
+import junit.framework.JUnit4TestAdapter;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -46,15 +47,15 @@ public class ContentFullContextTestSuite extends TestSuite
// These tests need a full context, at least for now
suite.addTestSuite(ContentStoreCleanerTest.class);
//suite.addTestSuite(CharsetFinderTest.class);
- suite.addTestSuite(FileContentStoreTest.class);
- suite.addTestSuite(NoRandomAccessFileContentStoreTest.class);
- suite.addTestSuite(ReadOnlyFileContentStoreTest.class);
+ suite.addTest(new JUnit4TestAdapter(FileContentStoreTest.class));
+ suite.addTest(new JUnit4TestAdapter(NoRandomAccessFileContentStoreTest.class));
+ suite.addTest(new JUnit4TestAdapter(ReadOnlyFileContentStoreTest.class));
suite.addTestSuite(ContentStoreReplicatorTest.class);
- suite.addTestSuite(ReplicatingContentStoreTest.class);
+ suite.addTest(new JUnit4TestAdapter(ReplicatingContentStoreTest.class));
suite.addTestSuite(ContentDataTest.class);
//suite.addTestSuite(MimetypeMapTest.class);
suite.addTestSuite(RoutingContentServiceTest.class);
- suite.addTestSuite(RoutingContentStoreTest.class);
+ suite.addTest(new JUnit4TestAdapter(RoutingContentStoreTest.class));
try
{
diff --git a/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java b/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java
index 9bc558a434..4a3aec2c36 100644
--- a/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,6 +18,12 @@
*/
package org.alfresco.repo.content;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@@ -33,6 +39,8 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.Pair;
import org.alfresco.util.TempFileProvider;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
/**
@@ -54,10 +62,9 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
private ContentStore storeD;
private ContentStore routingStore;
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
- super.setUp();
File tempDir = TempFileProvider.getTempDir();
// Create a subdirectory for A
File storeADir = new File(tempDir, "A");
@@ -80,6 +87,7 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
return routingStore;
}
+ @Test
public void testSetUp() throws Exception
{
assertNotNull(routingStore);
@@ -105,6 +113,7 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
/**
* Checks that requests for missing content URLs are served.
*/
+ @Test
public void testMissingUrl()
{
String missingContentUrl = FileContentStore.createNewFileStoreUrl();
@@ -123,13 +132,14 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
}
}
+ @Test
public void testGeneralUse()
{
for (int i = 0 ; i < 20; i++)
{
ContentContext contentContext = new ContentContext(null, null);
ContentWriter writer = routingStore.getWriter(contentContext);
- String content = "This was generated by " + this.getClass().getName() + "#" + getName() + " number " + i;
+ String content = "This was generated by " + this.getClass().getName() + "#testGeneralUse number " + i;
writer.putContent(content);
// Check that it exists
String contentUrl = writer.getContentUrl();
diff --git a/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java b/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java
index 1f956ba492..49718663cd 100644
--- a/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java
+++ b/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,12 +18,15 @@
*/
package org.alfresco.repo.content.caching;
-import java.io.File;
-import java.util.Arrays;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.File;
+import java.util.Arrays;
+
import org.alfresco.repo.cache.DefaultSimpleCache;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.content.AbstractWritableContentStoreTest;
@@ -34,11 +37,11 @@ import org.alfresco.repo.content.filestore.FileContentStore;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.TempFileProvider;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
import org.junit.internal.runners.JUnit38ClassRunner;
import org.junit.runner.RunWith;
-
/**
* Tests for the CachingContentStore that benefit from a full set of tests
* defined in AbstractWritableContentStoreTest.
@@ -54,11 +57,9 @@ public class CachingContentStoreSpringTest extends AbstractWritableContentStoreT
private ContentCacheImpl cache;
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
- super.setUp();
-
File tempDir = TempFileProvider.getTempDir();
backingStore = new FileContentStore(ctx,
diff --git a/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java b/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
index d95d3ceaa2..d0440f9ceb 100644
--- a/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
@@ -18,6 +18,12 @@
*/
package org.alfresco.repo.content.filestore;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.nio.ByteBuffer;
@@ -32,6 +38,7 @@ import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.TempFileProvider;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
/**
@@ -46,11 +53,9 @@ public class FileContentStoreTest extends AbstractWritableContentStoreTest
{
private FileContentStore store;
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
- super.setUp();
-
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
store = new FileContentStore(ctx,
diff --git a/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java b/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
index 467e783beb..f46a63b380 100644
--- a/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
@@ -24,6 +24,7 @@ import org.alfresco.repo.content.AbstractWritableContentStoreTest;
import org.alfresco.repo.content.ContentStore;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.TempFileProvider;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
/**
@@ -39,11 +40,9 @@ public class NoRandomAccessFileContentStoreTest extends AbstractWritableContentS
{
private FileContentStore store;
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
- super.setUp();
-
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
store = new FileContentStore(ctx,
diff --git a/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java b/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
index 421ee05498..dcc4883548 100644
--- a/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
@@ -21,10 +21,10 @@ package org.alfresco.repo.content.filestore;
import java.io.File;
import org.alfresco.repo.content.AbstractReadOnlyContentStoreTest;
-import org.alfresco.repo.content.AbstractWritableContentStoreTest;
import org.alfresco.repo.content.ContentStore;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.TempFileProvider;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
/**
@@ -40,11 +40,9 @@ public class ReadOnlyFileContentStoreTest extends AbstractReadOnlyContentStoreTe
{
private FileContentStore store;
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
- super.setUp();
-
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
store = new FileContentStore(ctx,
diff --git a/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java b/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
index 6139578135..6351a099b8 100644
--- a/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
+++ b/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,6 +18,10 @@
*/
package org.alfresco.repo.content.replication;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
@@ -38,6 +42,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.GUID;
import org.alfresco.util.TempFileProvider;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
/**
@@ -59,11 +64,9 @@ public class ReplicatingContentStoreTest extends AbstractWritableContentStoreTes
private ContentStore primaryStore;
private List secondaryStores;
- @Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
- super.setUp();
-
File tempDir = TempFileProvider.getTempDir();
// create a primary file store
String storeDir = tempDir.getAbsolutePath() + File.separatorChar + GUID.generate();