diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..0c878eeee0
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,79 @@
+dist: trusty
+sudo: required
+language: java
+jdk:
+ - openjdk11
+# Backwards compatibility with Java 8
+# - oraclejdk8
+services:
+ - docker
+
+matrix:
+ include:
+ - name: "AllUnitTestsSuite"
+ script: mvn test -B -Dtest=AllUnitTestsSuite
+ - name: "AppContext01TestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "AppContext02TestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "AppContext03TestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "AppContext04TestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "AppContext05TestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AppContext05TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "AppContext06TestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-pdf-renderer:1.3
+ - docker run -d -p 8091:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-imagemagick:1.3
+ - docker run -d -p 8092:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-libreoffice:1.3
+ - docker run -d -p 8093:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-tika:1.3
+ script: travis_wait 20 mvn test -B -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8092/ -Dimg.url=http://localhost:8091/ -Dtika.url=http://localhost:8093/
+ - name: "AppContextExtraTestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "MiscContextTestSuite"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-pdf-renderer:1.3
+ - docker run -d -p 8091:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-imagemagick:1.3
+ - docker run -d -p 8092:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-libreoffice:1.3
+ - docker run -d -p 8093:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-tika:1.3
+ script: travis_wait 20 mvn test -B -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8092/ -Dimg.url=http://localhost:8091/ -Dtika.url=http://localhost:8093/
+ - name: "MySQL tests"
+ before_install:
+ - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mysql:5.7.23 --transaction-isolation='READ-COMMITTED'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "PostgreSQL tests"
+ before_install:
+ - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.1 postgres -c 'max_connections=300'
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+ - name: "MariaDB tests"
+ before_install:
+ - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.2.18 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+ - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.6
+ script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.url=jdbc:mariadb://localhost/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+
+install: travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
diff --git a/README.md b/README.md
index 56abaf5e51..ff7c682f59 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
### Alfresco Repository
+
Repository is a library packaged as a jar file which is part of [Alfresco Content Services Repository](https://community.alfresco.com/docs/DOC-6385-project-overview-repository).
The library contains the following:
* DAOs and SQL scripts
@@ -36,4 +37,4 @@ and Alfresco Maven repository:
The SNAPSHOT version of the artifact is **never** published.
### Contributing guide
-Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
\ No newline at end of file
+Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
diff --git a/src/test/java/org/alfresco/AppContext06TestSuite.java b/src/test/java/org/alfresco/AppContext06TestSuite.java
index 4d67954121..ad2ff35d7f 100644
--- a/src/test/java/org/alfresco/AppContext06TestSuite.java
+++ b/src/test/java/org/alfresco/AppContext06TestSuite.java
@@ -35,10 +35,23 @@ import org.junit.runners.Suite;
* Repository project tests using the main context alfresco/application-context.xml.
* To balance test jobs tests using this context have been split into multiple test suites.
* Tests marked as DBTests are automatically excluded and are run as part of {@link AllDBTestsTestSuite}.
+ *
+ *
+ * All of the tests are using Spring annotations to load full application context, see BaseSpringTest
+ * Any new tests included in this test suite must follow the same pattern
+ *
*/
@RunWith(Categories.class)
@Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
@Suite.SuiteClasses({
+ // Requires a running ActiveMQ
+ org.alfresco.repo.rawevents.EventBehaviourTest.class,
+ org.alfresco.repo.rawevents.TransactionAwareEventProducerTest.class,
+ // Requires running transformers
+ org.alfresco.repo.rendition2.RenditionService2IntegrationTest.class,
+ org.alfresco.repo.rendition2.LegacyLocalTransformClientIntegrationTest.class,
+ org.alfresco.repo.rendition2.LegacyLocalTransformServiceRegistryTest.class,
+ org.alfresco.repo.rendition2.RenditionTest.class,
org.alfresco.repo.solr.SOLRTrackingComponentTest.class,
org.alfresco.repo.tagging.TaggingServiceImplTest.class,
org.alfresco.repo.transaction.AlfrescoTransactionSupportTest.class,
diff --git a/src/test/java/org/alfresco/MiscContextTestSuite.java b/src/test/java/org/alfresco/MiscContextTestSuite.java
index 4587ddac93..6dc71f675c 100644
--- a/src/test/java/org/alfresco/MiscContextTestSuite.java
+++ b/src/test/java/org/alfresco/MiscContextTestSuite.java
@@ -4,21 +4,21 @@
* %%
* Copyright (C) 2005 - 2017 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco 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 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco 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 Alfresco. If not, see schedules = service.listSchedules();
@@ -140,8 +135,8 @@ public class ScheduledPersistedActionServiceTest extends TestCase
scheduler.standby();
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
@@ -161,6 +156,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Test that the {@link ScheduledPersistedAction} implementation behaves properly
*/
+ @Test
public void testPersistedActionImpl() throws Exception
{
ScheduledPersistedActionImpl schedule = new ScheduledPersistedActionImpl(testAction);
@@ -250,6 +246,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that the to-trigger stuff works properly
*/
+ @Test
public void testActionToTrigger() throws Exception
{
// Can't get a trigger until persisted
@@ -385,6 +382,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that the triggers are suitably tweaked based on when the last run occured
*/
+ @Test
public void testAsTriggerLastRun() throws Exception
{
long future = System.currentTimeMillis() + 1234567;
@@ -571,6 +569,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that we can create, save, edit, delete etc the scheduled persisted actions
*/
+ @Test
public void testCreation()
{
ScheduledPersistedAction schedule = service.createSchedule(testAction);
@@ -592,6 +591,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
assertEquals(ScheduledPersistedAction.IntervalPeriod.Day, schedule.getScheduleIntervalPeriod());
}
+ @Test
public void testCreateSaveLoad() throws Exception
{
// create and save schedule
@@ -648,6 +648,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
* Ensures that we can create, save, edit, save load, edit, save, load etc, all without problems, and without
* creating duplicates
*/
+ @Test
public void testEditing() throws Exception
{
// create and save schedule
@@ -729,6 +730,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that the listings work, both of all scheduled, and from an action
*/
+ @Test
public void testLoadList() throws Exception
{
assertEquals(0, service.listSchedules().size());
@@ -750,6 +752,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
assertEquals(2, service.listSchedules().size());
}
+ @Test
public void testLoadFromAction() throws Exception
{
// Create schedule
@@ -770,6 +773,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that the startup registering works properly
*/
+ @Test
public void testStartup() throws Exception
{
// Startup with none there, nothing happens
@@ -792,7 +796,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
schedule.setScheduleStart(new Date(future));
service.saveSchedule(schedule);
- ((ScheduledPersistedActionServiceImpl) ctx.getBean("scheduledPersistedActionService"))
+ ((ScheduledPersistedActionServiceImpl) applicationContext.getBean("scheduledPersistedActionService"))
.removeFromScheduler((ScheduledPersistedActionImpl) schedule);
assertEquals(0, scheduler
@@ -812,6 +816,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Ensures that deletion works correctly
*/
+ @Test
public void testDeletion() throws Exception
{
// Delete does nothing if not persisted
@@ -890,6 +895,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that things get properly injected onto the job bean
*/
+ @Test
public void testJobBeanInjection() throws Exception
{
// This test needs the scheduler running properly
@@ -906,7 +912,7 @@ public class ScheduledPersistedActionServiceTest extends TestCase
.startAt(new Date(1))
.withSchedule(SimpleScheduleBuilder.simpleSchedule().withMisfireHandlingInstructionFireNow())
.build();
- Scheduler scheduler = (Scheduler) ctx.getBean("schedulerFactory");
+ Scheduler scheduler = (Scheduler) applicationContext.getBean("schedulerFactory");
scheduler.scheduleJob(details, now);
// Allow it to run
@@ -924,9 +930,10 @@ public class ScheduledPersistedActionServiceTest extends TestCase
/**
* Tests that things actually get run correctly. Each sub-test runs in its own transaction
*/
+ @Test
public void testExecution() throws Exception
{
- final SleepActionExecuter sleepActionExec = (SleepActionExecuter) ctx.getBean(SleepActionExecuter.NAME);
+ final SleepActionExecuter sleepActionExec = (SleepActionExecuter) applicationContext.getBean(SleepActionExecuter.NAME);
sleepActionExec.resetTimesExecuted();
sleepActionExec.setSleepMs(1);
@@ -1114,9 +1121,10 @@ public class ScheduledPersistedActionServiceTest extends TestCase
* Tests that when we have more than one schedule defined and active, then the correct things run at the correct
* times, and we never get confused
*/
+ @Test
public void testMultipleExecutions() throws Exception
{
- final SleepActionExecuter sleepActionExec = (SleepActionExecuter) ctx.getBean(SleepActionExecuter.NAME);
+ final SleepActionExecuter sleepActionExec = (SleepActionExecuter) applicationContext.getBean(SleepActionExecuter.NAME);
sleepActionExec.resetTimesExecuted();
sleepActionExec.setSleepMs(1);
@@ -1220,4 +1228,4 @@ public class ScheduledPersistedActionServiceTest extends TestCase
super(action);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java b/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java
index 80e7a6f427..0ed0d2d8a1 100644
--- a/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java
+++ b/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java
@@ -4,32 +4,27 @@
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco 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 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco 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 Alfresco. If not, see ()
- {
- @Override
- public SiteInfo execute() throws Throwable
+ new RetryingTransactionHelper.RetryingTransactionCallback()
{
- SiteInfo site = SITE_SERVICE.createSite("BlogSitePreset", BlogServiceImplTest.class.getSimpleName() + "_testSite" + GUID.generate(),
- "test site title", "test site description", SiteVisibility.PUBLIC);
- CLASS_TEST_NODES_TO_TIDY.add(site.getNodeRef());
- return site;
- }
- });
-
+ @Override
+ public SiteInfo execute() throws Throwable
+ {
+ SiteInfo site = SITE_SERVICE.createSite("BlogSitePreset", BlogServiceImplTest.class.getSimpleName() + "_testSite" + GUID.generate(),
+ "test site title", "test site description", SiteVisibility.PUBLIC);
+ CLASS_TEST_NODES_TO_TIDY.add(site.getNodeRef());
+ return site;
+ }
+ });
+
BLOG_CONTAINER_NODE = TRANSACTION_HELPER.doInTransaction(
- new RetryingTransactionHelper.RetryingTransactionCallback()
- {
- @Override
- public NodeRef execute() throws Throwable
+ new RetryingTransactionHelper.RetryingTransactionCallback()
{
- SiteInfo site = BLOG_SITE;
- NodeRef result = SITE_SERVICE.getContainer(site.getShortName(), BlogServiceImpl.BLOG_COMPONENT);
-
- if (result == null)
+ @Override
+ public NodeRef execute() throws Throwable
{
- result = SITE_SERVICE.createContainer(site.getShortName(), BlogServiceImpl.BLOG_COMPONENT,
- ContentModel.TYPE_FOLDER, null);
- CLASS_TEST_NODES_TO_TIDY.add(result);
- }
-
- return result;
- }
- });
- }
+ SiteInfo site = BLOG_SITE;
+ NodeRef result = SITE_SERVICE.getContainer(site.getShortName(), BlogServiceImpl.BLOG_COMPONENT);
- /**
- * By default, all tests are run as the admin user.
- */
- @Before public void setAdminUser()
- {
- AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
- }
-
- @After public void deleteTestNodes() throws Exception
- {
- performDeletionOfNodes(testNodesToTidy);
- }
-
- @AfterClass public static void deleteClassTestNodesAndUsers() throws Exception
- {
- performDeletionOfNodes(CLASS_TEST_NODES_TO_TIDY);
- deleteUser(TEST_USER);
- }
-
- /**
- * Deletes the specified NodeRefs, if they exist.
- * @param nodesToDelete List
- */
- private static void performDeletionOfNodes(final List nodesToDelete)
- {
- TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
- {
- @Override
- public Void execute() throws Throwable
- {
- AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
-
- for (NodeRef node : nodesToDelete)
- {
- if (NODE_SERVICE.exists(node))
+ if (result == null)
{
- // st:site nodes can only be deleted via the SiteService
- if (NODE_SERVICE.getType(node).equals(SiteModel.TYPE_SITE))
- {
-
- SiteInfo siteInfo = SITE_SERVICE.getSite(node);
- SITE_SERVICE.deleteSite(siteInfo.getShortName());
- }
- else
- {
- NODE_SERVICE.deleteNode(node);
- }
+ result = SITE_SERVICE.createContainer(site.getShortName(), BlogServiceImpl.BLOG_COMPONENT,
+ ContentModel.TYPE_FOLDER, null);
+ CLASS_TEST_NODES_TO_TIDY.add(result);
}
+
+ return result;
}
-
- return null;
- }
- });
+ });
}
-
+
@Test public void createDraftBlogPostsAndGetPagedResults() throws Exception
{
final int arbitraryNumberGreaterThanPageSize = 42;
final List submittedBlogPosts = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback>()
+ {
+ @Override
+ public List execute() throws Throwable
{
- @Override
- public List execute() throws Throwable
+ List results = new ArrayList();
+
+ for (int i = 0; i < arbitraryNumberGreaterThanPageSize; i++)
{
- List results = new ArrayList();
-
- for (int i = 0; i < arbitraryNumberGreaterThanPageSize; i++)
+ BlogPostInfo newBlogPost;
+ if(i % 2 == 0)
{
- BlogPostInfo newBlogPost;
- if(i % 2 == 0)
- {
- // By container ref
- newBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "title_" + i, "Hello world", true);
- }
- else
- {
- // By site name
- newBlogPost = BLOG_SERVICE.createBlogPost(BLOG_SITE.getShortName(), "title_" + i, "Hello world", true);
- }
-
- results.add(newBlogPost.getNodeRef());
- testNodesToTidy.add(newBlogPost.getNodeRef());
+ // By container ref
+ newBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "title_" + i, "Hello world", true);
}
-
- return results;
+ else
+ {
+ // By site name
+ newBlogPost = BLOG_SERVICE.createBlogPost(BLOG_SITE.getShortName(), "title_" + i, "Hello world", true);
+ }
+
+ results.add(newBlogPost.getNodeRef());
+ testNodesToTidy.add(newBlogPost.getNodeRef());
}
- });
-
+
+ return results;
+ }
+ });
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
+ List recoveredBlogPosts = new ArrayList(arbitraryNumberGreaterThanPageSize);
+
+ final int pageSize = 10;
+ PagingRequest pagingReq = new PagingRequest(0, pageSize, null);
+ pagingReq.setRequestTotalCountMax(arbitraryNumberGreaterThanPageSize); // must be set if calling getTotalResultCount() later
+
+ PagingResults pagedResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
+ assertEquals("Wrong total result count.", arbitraryNumberGreaterThanPageSize, (int)pagedResults.getTotalResultCount().getFirst());
+
+ while (pagedResults.hasMoreItems())
{
- List recoveredBlogPosts = new ArrayList(arbitraryNumberGreaterThanPageSize);
-
- final int pageSize = 10;
- PagingRequest pagingReq = new PagingRequest(0, pageSize, null);
- pagingReq.setRequestTotalCountMax(arbitraryNumberGreaterThanPageSize); // must be set if calling getTotalResultCount() later
-
- PagingResults pagedResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
- assertEquals("Wrong total result count.", arbitraryNumberGreaterThanPageSize, (int)pagedResults.getTotalResultCount().getFirst());
-
- while (pagedResults.hasMoreItems())
- {
- recoveredBlogPosts.addAll(pagedResults.getPage());
- pagingReq = new PagingRequest(pagingReq.getSkipCount() + pageSize, pageSize, null);
- pagedResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
- }
- // and the last page, which only has 2 items in it.
recoveredBlogPosts.addAll(pagedResults.getPage());
-
- assertEquals("Wrong number of blog posts.", submittedBlogPosts.size(), recoveredBlogPosts.size());
-
- // Check the list is sorted by cm:created, descending order.
- assertNodeRefsAreSortedBy(recoveredBlogPosts, ContentModel.PROP_CREATED, false);
-
- return null;
+ pagingReq = new PagingRequest(pagingReq.getSkipCount() + pageSize, pageSize, null);
+ pagedResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
}
- });
+ // and the last page, which only has 2 items in it.
+ recoveredBlogPosts.addAll(pagedResults.getPage());
+
+ assertEquals("Wrong number of blog posts.", submittedBlogPosts.size(), recoveredBlogPosts.size());
+
+ // Check the list is sorted by cm:created, descending order.
+ assertNodeRefsAreSortedBy(recoveredBlogPosts, ContentModel.PROP_CREATED, false);
+
+ return null;
+ }
+ });
}
-
+
/**
* This method asserts that the given List has NodeRefs in order of the specified date property.
- *
+ *
* @param blogPosts List
* @param property a Date property
* @param ascendingOrder true if ascending order, false for descending.
@@ -303,7 +237,7 @@ public class BlogServiceImplTest
final PropertyDefinition propertyDef = DICTIONARY_SERVICE.getProperty(property);
assertNotNull("Property not recognised.", propertyDef);
assertEquals("Property was not a Date", DataTypeDefinition.DATETIME, propertyDef.getDataType().getName());
-
+
if (blogPosts.size() > 1)
{
for (int i = 0; i < blogPosts.size() - 1; i++)
@@ -312,13 +246,13 @@ public class BlogServiceImplTest
NodeRef nodeRef2 = blogPosts.get(i + 1).getNodeRef();
Date date1 = (Date) NODE_SERVICE.getProperty(nodeRef1, property);
Date date2 = (Date) NODE_SERVICE.getProperty(nodeRef2, property);
-
+
// Equal dates are applicable to either sort order
if (date1.equals(date2))
{
continue;
}
-
+
if (ascendingOrder)
{
assertTrue("BlogPosts not asc-sorted by " + property + ". Error at index " + i, date1.before(date2));
@@ -336,60 +270,60 @@ public class BlogServiceImplTest
{
// Our tags, which are a mixture of English, Accented European and Chinese
final List tags = Arrays.asList(new String[]{
- "alpha", "beta", "gamma", "fran\u00e7ais", "chinese_\u535a\u5ba2"});
-
+ "alpha", "beta", "gamma", "fran\u00e7ais", "chinese_\u535a\u5ba2"});
+
// Create a list of Blog Posts, all drafts, each with one of the tags above.
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback>()
+ {
+
+ @Override
+ public List execute() throws Throwable
{
-
- @Override
- public List execute() throws Throwable
+ List results = new ArrayList();
+
+ for (String tag : tags)
{
- List results = new ArrayList();
-
- for (String tag : tags)
- {
- final String blogTitle = "draftWithTag" + tag;
- BlogPostInfo newBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, blogTitle, "Hello world", true);
- TAGGING_SERVICE.addTags(newBlogPost.getNodeRef(), Arrays.asList(new String[]{tag}));
- testNodesToTidy.add(newBlogPost.getNodeRef());
- results.add(newBlogPost.getNodeRef());
- }
-
- return results;
+ final String blogTitle = "draftWithTag" + tag;
+ BlogPostInfo newBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, blogTitle, "Hello world", true);
+ TAGGING_SERVICE.addTags(newBlogPost.getNodeRef(), Arrays.asList(new String[]{tag}));
+ testNodesToTidy.add(newBlogPost.getNodeRef());
+ results.add(newBlogPost.getNodeRef());
}
- });
-
+
+ return results;
+ }
+ });
+
// Check we get the correct tags back
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
+ // Now we'll recover these blogposts & we should expect to find the same tags.
+ Set expectedTags = new HashSet();
+ expectedTags.addAll(tags);
+
+ PagingRequest pagingReq = new PagingRequest(0, 10, null);
+
+ PagingResults pagedResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
+ assertEquals("Wrong number of blog posts", tags.size(), pagedResults.getPage().size());
+
+ for (BlogPostInfo bpi : pagedResults.getPage())
{
- // Now we'll recover these blogposts & we should expect to find the same tags.
- Set expectedTags = new HashSet();
- expectedTags.addAll(tags);
-
- PagingRequest pagingReq = new PagingRequest(0, 10, null);
-
- PagingResults pagedResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
- assertEquals("Wrong number of blog posts", tags.size(), pagedResults.getPage().size());
-
- for (BlogPostInfo bpi : pagedResults.getPage())
- {
- NodeRef blogNode = bpi.getNodeRef();
- List recoveredTags = TAGGING_SERVICE.getTags(blogNode);
- assertEquals("Wrong number of tags", 1, recoveredTags.size());
-
- String tag = recoveredTags.get(0);
- assertTrue("Tag found on node but not expected: " + tag, expectedTags.remove(tag));
- }
- assertTrue("Not all tags were recovered from a blogpost", expectedTags.isEmpty());
-
- return null;
+ NodeRef blogNode = bpi.getNodeRef();
+ List recoveredTags = TAGGING_SERVICE.getTags(blogNode);
+ assertEquals("Wrong number of tags", 1, recoveredTags.size());
+
+ String tag = recoveredTags.get(0);
+ assertTrue("Tag found on node but not expected: " + tag, expectedTags.remove(tag));
}
- });
-
+ assertTrue("Not all tags were recovered from a blogpost", expectedTags.isEmpty());
+
+ return null;
+ }
+ });
+
// Check we can find the posts by their tags
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
{
@@ -397,20 +331,20 @@ public class BlogServiceImplTest
public Void execute() throws Throwable
{
PagingRequest pagingReq = new PagingRequest(0, 10, null);
- RangedDateProperty dates = new RangedDateProperty(null, null, ContentModel.PROP_CREATED);
+ RangedDateProperty dates = new RangedDateProperty(null, null, ContentModel.PROP_CREATED);
for (String tag : tags)
{
- PagingResults pagedResults =
- BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, dates, tag, pagingReq);
-
- // Check we found our post
- assertEquals("Wrong number of blog posts for " + tag, 1, pagedResults.getPage().size());
+ PagingResults pagedResults =
+ BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, dates, tag, pagingReq);
+
+ // Check we found our post
+ assertEquals("Wrong number of blog posts for " + tag, 1, pagedResults.getPage().size());
}
return null;
}
});
}
-
+
/**
* This test method uses the eventually consistent find*() method and so may fail if Lucene is disabled.
*/
@@ -418,7 +352,7 @@ public class BlogServiceImplTest
@Test public void findBlogPostsByPublishedDate() throws Exception
{
final List tags = Arrays.asList(new String[]{"hello", "goodbye"});
-
+
// Going to set some specific published dates on these blog posts & query by date.
final Calendar cal = Calendar.getInstance();
cal.set(1971, 6, 15);
@@ -433,175 +367,175 @@ public class BlogServiceImplTest
final Date _1985 = cal.getTime();
cal.set(1991, 6, 15);
final Date _1991 = cal.getTime();
-
+
final Map blogPosts = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback>()
+ {
+ @Override
+ public Map execute() throws Throwable
{
- @Override
- public Map execute() throws Throwable
- {
- Map result = new HashMap();
-
- // Create some blog posts. They'll all be published 'now' of course...
- final BlogPostInfo blogPost1971 = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPostWithTags1971", "Hello world", true);
- final BlogPostInfo blogPost1981 = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPostWithTags1981", "Hello world", true);
- final BlogPostInfo blogPost1991 = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPostWithTags1991", "Hello world", true);
-
- TAGGING_SERVICE.addTags(blogPost1971.getNodeRef(), tags);
- TAGGING_SERVICE.addTags(blogPost1981.getNodeRef(), tags);
- TAGGING_SERVICE.addTags(blogPost1991.getNodeRef(), tags);
-
- testNodesToTidy.add(blogPost1971.getNodeRef());
- testNodesToTidy.add(blogPost1981.getNodeRef());
- testNodesToTidy.add(blogPost1991.getNodeRef());
-
- // We need to 'cheat' and set the nodes' cm:published dates to specific values.
- NODE_SERVICE.setProperty(blogPost1971.getNodeRef(), ContentModel.PROP_PUBLISHED, _1971);
- NODE_SERVICE.setProperty(blogPost1981.getNodeRef(), ContentModel.PROP_PUBLISHED, _1981);
- NODE_SERVICE.setProperty(blogPost1991.getNodeRef(), ContentModel.PROP_PUBLISHED, _1991);
-
- result.put(1971, blogPost1971.getNodeRef());
- result.put(1981, blogPost1981.getNodeRef());
- result.put(1991, blogPost1991.getNodeRef());
-
- return result;
- }
- });
-
+ Map result = new HashMap();
+
+ // Create some blog posts. They'll all be published 'now' of course...
+ final BlogPostInfo blogPost1971 = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPostWithTags1971", "Hello world", true);
+ final BlogPostInfo blogPost1981 = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPostWithTags1981", "Hello world", true);
+ final BlogPostInfo blogPost1991 = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPostWithTags1991", "Hello world", true);
+
+ TAGGING_SERVICE.addTags(blogPost1971.getNodeRef(), tags);
+ TAGGING_SERVICE.addTags(blogPost1981.getNodeRef(), tags);
+ TAGGING_SERVICE.addTags(blogPost1991.getNodeRef(), tags);
+
+ testNodesToTidy.add(blogPost1971.getNodeRef());
+ testNodesToTidy.add(blogPost1981.getNodeRef());
+ testNodesToTidy.add(blogPost1991.getNodeRef());
+
+ // We need to 'cheat' and set the nodes' cm:published dates to specific values.
+ NODE_SERVICE.setProperty(blogPost1971.getNodeRef(), ContentModel.PROP_PUBLISHED, _1971);
+ NODE_SERVICE.setProperty(blogPost1981.getNodeRef(), ContentModel.PROP_PUBLISHED, _1981);
+ NODE_SERVICE.setProperty(blogPost1991.getNodeRef(), ContentModel.PROP_PUBLISHED, _1991);
+
+ result.put(1971, blogPost1971.getNodeRef());
+ result.put(1981, blogPost1981.getNodeRef());
+ result.put(1991, blogPost1991.getNodeRef());
+
+ return result;
+ }
+ });
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @SuppressWarnings("deprecation")
+ @Override
+ public Void execute() throws Throwable
{
- @SuppressWarnings("deprecation")
- @Override
- public Void execute() throws Throwable
+ // Quick sanity check: Did our cheating with the cm:created dates work?
+ assertEquals("Incorrect published date", 71, ((Date)NODE_SERVICE.getProperty(blogPosts.get(1971), ContentModel.PROP_PUBLISHED)).getYear());
+
+ PagingRequest pagingReq = new PagingRequest(0, 10, null);
+
+ final RangedDateProperty publishedBefore1980 = new RangedDateProperty(null, _1980, ContentModel.PROP_PUBLISHED);
+ final RangedDateProperty publishedAfter1980 = new RangedDateProperty(_1980, null, ContentModel.PROP_PUBLISHED);
+ final RangedDateProperty publishedBetween1975And1985 = new RangedDateProperty(_1975, _1985, ContentModel.PROP_PUBLISHED);
+
+ // Find all
+ PagingResults pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, null, null, pagingReq);
+ assertEquals("Wrong number of blog posts", 3, pagedResults.getPage().size());
+ Set recoveredBlogNodes = new HashSet();
+ for (BlogPostInfo bpi : pagedResults.getPage())
{
- // Quick sanity check: Did our cheating with the cm:created dates work?
- assertEquals("Incorrect published date", 71, ((Date)NODE_SERVICE.getProperty(blogPosts.get(1971), ContentModel.PROP_PUBLISHED)).getYear());
-
- PagingRequest pagingReq = new PagingRequest(0, 10, null);
-
- final RangedDateProperty publishedBefore1980 = new RangedDateProperty(null, _1980, ContentModel.PROP_PUBLISHED);
- final RangedDateProperty publishedAfter1980 = new RangedDateProperty(_1980, null, ContentModel.PROP_PUBLISHED);
- final RangedDateProperty publishedBetween1975And1985 = new RangedDateProperty(_1975, _1985, ContentModel.PROP_PUBLISHED);
-
- // Find all
- PagingResults pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, null, null, pagingReq);
- assertEquals("Wrong number of blog posts", 3, pagedResults.getPage().size());
- Set recoveredBlogNodes = new HashSet();
- for (BlogPostInfo bpi : pagedResults.getPage())
- {
- recoveredBlogNodes.add(bpi.getNodeRef());
- }
-
- assertTrue("Missing expected BlogPost NodeRef 71", recoveredBlogNodes.contains(blogPosts.get(1971)));
- assertTrue("Missing expected BlogPost NodeRef 81", recoveredBlogNodes.contains(blogPosts.get(1981)));
- assertTrue("Missing expected BlogPost NodeRef 91", recoveredBlogNodes.contains(blogPosts.get(1991)));
-
-
- // Find posts before date
- pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, publishedBefore1980, null, pagingReq);
- assertEquals("Wrong blog post count", 1, pagedResults.getPage().size());
-
- NodeRef blogNode = pagedResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect NodeRef.", blogNode, blogPosts.get(1971));
-
- List recoveredTags = TAGGING_SERVICE.getTags(blogNode);
- assertEquals("Incorrect tags.", tags, recoveredTags);
-
-
- // Find posts after date
- pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, publishedAfter1980, "hello", pagingReq);
- assertEquals("Wrong blog post count", 2, pagedResults.getPage().size());
-
- blogNode = pagedResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect NodeRef.", blogNode, blogPosts.get(1981));
-
-
- // Find posts between dates
- pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, publishedBetween1975And1985, "hello", pagingReq);
- assertEquals("Wrong blog post count", 1, pagedResults.getPage().size());
-
- blogNode = pagedResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect NodeRef.", blogNode, blogPosts.get(1981));
-
- return null;
+ recoveredBlogNodes.add(bpi.getNodeRef());
}
- });
+
+ assertTrue("Missing expected BlogPost NodeRef 71", recoveredBlogNodes.contains(blogPosts.get(1971)));
+ assertTrue("Missing expected BlogPost NodeRef 81", recoveredBlogNodes.contains(blogPosts.get(1981)));
+ assertTrue("Missing expected BlogPost NodeRef 91", recoveredBlogNodes.contains(blogPosts.get(1991)));
+
+
+ // Find posts before date
+ pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, publishedBefore1980, null, pagingReq);
+ assertEquals("Wrong blog post count", 1, pagedResults.getPage().size());
+
+ NodeRef blogNode = pagedResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect NodeRef.", blogNode, blogPosts.get(1971));
+
+ List recoveredTags = TAGGING_SERVICE.getTags(blogNode);
+ assertEquals("Incorrect tags.", tags, recoveredTags);
+
+
+ // Find posts after date
+ pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, publishedAfter1980, "hello", pagingReq);
+ assertEquals("Wrong blog post count", 2, pagedResults.getPage().size());
+
+ blogNode = pagedResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect NodeRef.", blogNode, blogPosts.get(1981));
+
+
+ // Find posts between dates
+ pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, publishedBetween1975And1985, "hello", pagingReq);
+ assertEquals("Wrong blog post count", 1, pagedResults.getPage().size());
+
+ blogNode = pagedResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect NodeRef.", blogNode, blogPosts.get(1981));
+
+ return null;
+ }
+ });
}
-
+
@Test public void ensureBlogPostsAreCorrectlySorted() throws Exception
{
final int testBlogCount = 3;
-
+
// Set up some test data to check sorting. We don't need to retain references to these posts.
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
+ // Create some blog posts. They'll all be published 'now' but the slight delay between each should ensure they
+ // are given distinct creation dates
+ final long slightDelay = 50;
+
+ for (int i = 0; i < testBlogCount; i++)
{
- // Create some blog posts. They'll all be published 'now' but the slight delay between each should ensure they
- // are given distinct creation dates
- final long slightDelay = 50;
-
- for (int i = 0; i < testBlogCount; i++)
- {
- BlogPostInfo newDraft = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "draftPost_ensureBlogPostsAreCorrectlySorted" + i, "x", true);
-
- Thread.sleep(slightDelay);
-
- // And the same for some published posts...
- BlogPostInfo newPublished = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPost_ensureBlogPostsAreCorrectlySorted" + i, "x", false);
-
- Thread.sleep(slightDelay);
-
- testNodesToTidy.add(newDraft.getNodeRef());
- testNodesToTidy.add(newPublished.getNodeRef());
- }
-
- return null;
+ BlogPostInfo newDraft = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "draftPost_ensureBlogPostsAreCorrectlySorted" + i, "x", true);
+
+ Thread.sleep(slightDelay);
+
+ // And the same for some published posts...
+ BlogPostInfo newPublished = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "publishedPost_ensureBlogPostsAreCorrectlySorted" + i, "x", false);
+
+ Thread.sleep(slightDelay);
+
+ testNodesToTidy.add(newDraft.getNodeRef());
+ testNodesToTidy.add(newPublished.getNodeRef());
}
- });
-
+
+ return null;
+ }
+ });
+
final PagingRequest pagingReq = new PagingRequest(100);
-
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @SuppressWarnings("deprecation")
+ @Override
+ public Void execute() throws Throwable
{
- @SuppressWarnings("deprecation")
- @Override
- public Void execute() throws Throwable
- {
- String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
-
- // get DRAFTS
- PagingResults resultsPage = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, currentUser, pagingReq);
- List blogPosts = resultsPage.getPage();
- assertTrue("Expected more draft blog posts than " + blogPosts.size(),
- blogPosts.size() >= testBlogCount);
-
- assertSortingIsCorrect(blogPosts);
-
- // And the published ones
- resultsPage = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, null, null, currentUser, pagingReq); // Date filtering tested elsewhere.
- blogPosts = resultsPage.getPage();
- assertTrue("Expected more published blog posts than " + blogPosts.size(),
- blogPosts.size() >= testBlogCount);
-
- assertSortingIsCorrect(blogPosts);
-
-
- // And the combination. This should be ordered:
- // published posts, most recent cm:published first - followed by
- // draft posts, most recent cm:created first
- System.out.println(" getMyDraftsAndAllPublished");
-
- resultsPage = BLOG_SERVICE.getMyDraftsAndAllPublished(BLOG_CONTAINER_NODE, null, null, pagingReq);
- blogPosts = resultsPage.getPage();
-
- assertSortingIsCorrect(blogPosts);
-
- return null;
- }
- });
+ String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+
+ // get DRAFTS
+ PagingResults resultsPage = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, currentUser, pagingReq);
+ List blogPosts = resultsPage.getPage();
+ assertTrue("Expected more draft blog posts than " + blogPosts.size(),
+ blogPosts.size() >= testBlogCount);
+
+ assertSortingIsCorrect(blogPosts);
+
+ // And the published ones
+ resultsPage = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, null, null, currentUser, pagingReq); // Date filtering tested elsewhere.
+ blogPosts = resultsPage.getPage();
+ assertTrue("Expected more published blog posts than " + blogPosts.size(),
+ blogPosts.size() >= testBlogCount);
+
+ assertSortingIsCorrect(blogPosts);
+
+
+ // And the combination. This should be ordered:
+ // published posts, most recent cm:published first - followed by
+ // draft posts, most recent cm:created first
+ System.out.println(" getMyDraftsAndAllPublished");
+
+ resultsPage = BLOG_SERVICE.getMyDraftsAndAllPublished(BLOG_CONTAINER_NODE, null, null, pagingReq);
+ blogPosts = resultsPage.getPage();
+
+ assertSortingIsCorrect(blogPosts);
+
+ return null;
+ }
+ });
}
-
+
private void assertSortingIsCorrect(List blogPosts)
{
// Sometimes you just have to see the data...
@@ -613,17 +547,17 @@ public class BlogServiceImplTest
System.out.print(" published: " + (published == null ? " " : published.getTime()));
System.out.println(" created : " + created.getTime());
}
-
+
for (int i = 0; i < blogPosts.size() - 1; i++) // We only want to iterate to the second-last item
{
BlogPostInfo nextBPI = blogPosts.get(i);
BlogPostInfo followingBPI = blogPosts.get(i + 1);
-
+
Date nextPublishedDate = (Date) NODE_SERVICE.getProperty(nextBPI.getNodeRef(), ContentModel.PROP_PUBLISHED);
Date followingPublishedDate = (Date) NODE_SERVICE.getProperty(followingBPI.getNodeRef(), ContentModel.PROP_PUBLISHED);
Date nextCreatedDate = (Date) NODE_SERVICE.getProperty(nextBPI.getNodeRef(), ContentModel.PROP_CREATED);
Date followingCreatedDate = (Date) NODE_SERVICE.getProperty(followingBPI.getNodeRef(), ContentModel.PROP_CREATED);
-
+
// published must precede draft
if ( nextPublishedDate == null && followingPublishedDate != null)
{
@@ -639,7 +573,7 @@ public class BlogServiceImplTest
}
}
}
-
+
/**
* This test uses two different users to create draft and internally published blog posts.
* Then it ensures that each user sees the correct posts when they retrieve them from the service.
@@ -648,181 +582,181 @@ public class BlogServiceImplTest
{
// Admin creates a draft and an internally-published blog post.
final Pair adminPosts = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback>()
+ {
+
+ @Override
+ public Pair execute() throws Throwable
{
-
- @Override
- public Pair execute() throws Throwable
- {
- BlogPostInfo newDraftBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "adminDraft", "", true);
- testNodesToTidy.add(newDraftBlogPost.getNodeRef());
-
- BlogPostInfo newPublishedBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "adminPublished", "", false);
- testNodesToTidy.add(newPublishedBlogPost.getNodeRef());
-
- return new Pair(newDraftBlogPost.getNodeRef(), newPublishedBlogPost.getNodeRef());
- }
- });
-
+ BlogPostInfo newDraftBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "adminDraft", "", true);
+ testNodesToTidy.add(newDraftBlogPost.getNodeRef());
+
+ BlogPostInfo newPublishedBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "adminPublished", "", false);
+ testNodesToTidy.add(newPublishedBlogPost.getNodeRef());
+
+ return new Pair(newDraftBlogPost.getNodeRef(), newPublishedBlogPost.getNodeRef());
+ }
+ });
+
// Then another user does the same.
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
final Pair userPosts = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback>()
+ {
+
+ @Override
+ public Pair execute() throws Throwable
{
-
- @Override
- public Pair execute() throws Throwable
- {
- BlogPostInfo newDraftBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "userDraft", "", true);
- testNodesToTidy.add(newDraftBlogPost.getNodeRef());
-
- BlogPostInfo newPublishedBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "userPublished", "", false);
- testNodesToTidy.add(newPublishedBlogPost.getNodeRef());
-
- return new Pair(newDraftBlogPost.getNodeRef(), newPublishedBlogPost.getNodeRef());
- }
- });
-
+ BlogPostInfo newDraftBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "userDraft", "", true);
+ testNodesToTidy.add(newDraftBlogPost.getNodeRef());
+
+ BlogPostInfo newPublishedBlogPost = BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "userPublished", "", false);
+ testNodesToTidy.add(newPublishedBlogPost.getNodeRef());
+
+ return new Pair(newDraftBlogPost.getNodeRef(), newPublishedBlogPost.getNodeRef());
+ }
+ });
+
// Now check what we see from the service.
AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
-
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
- {
- PagingRequest pagingReq = new PagingRequest(0, 10, null);
-
- PagingResults pagedDraftResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
- assertEquals("Wrong number of admin draft blog posts", 1, pagedDraftResults.getPage().size());
- NodeRef blogNode = pagedDraftResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect admin draft NodeRef.", blogNode, adminPosts.getFirst());
-
- PagingResults pagedPublishedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, null, null, ADMIN_USER, pagingReq);
- assertEquals("Wrong number of admin published blog posts", 1, pagedPublishedResults.getPage().size());
- blogNode = pagedPublishedResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect admin published NodeRef.", blogNode, adminPosts.getSecond());
-
- return null;
- }
- });
-
-
+ PagingRequest pagingReq = new PagingRequest(0, 10, null);
+
+ PagingResults pagedDraftResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, ADMIN_USER, pagingReq);
+ assertEquals("Wrong number of admin draft blog posts", 1, pagedDraftResults.getPage().size());
+ NodeRef blogNode = pagedDraftResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect admin draft NodeRef.", blogNode, adminPosts.getFirst());
+
+ PagingResults pagedPublishedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, null, null, ADMIN_USER, pagingReq);
+ assertEquals("Wrong number of admin published blog posts", 1, pagedPublishedResults.getPage().size());
+ blogNode = pagedPublishedResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect admin published NodeRef.", blogNode, adminPosts.getSecond());
+
+ return null;
+ }
+ });
+
+
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
-
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
- {
- PagingRequest pagingReq = new PagingRequest(0, 10, null);
-
- PagingResults pagedDraftResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, TEST_USER, pagingReq);
- assertEquals("Wrong number of user draft blog posts", 1, pagedDraftResults.getPage().size());
- NodeRef blogNode = pagedDraftResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect user draft NodeRef.", blogNode, userPosts.getFirst());
-
- PagingResults pagedPublishedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, null, null, TEST_USER, pagingReq);
- assertEquals("Wrong number of user published blog posts", 1, pagedPublishedResults.getPage().size());
- blogNode = pagedPublishedResults.getPage().get(0).getNodeRef();
- assertEquals("Incorrect user published NodeRef.", blogNode, userPosts.getSecond());
-
- return null;
- }
- });
+ PagingRequest pagingReq = new PagingRequest(0, 10, null);
+
+ PagingResults pagedDraftResults = BLOG_SERVICE.getDrafts(BLOG_CONTAINER_NODE, TEST_USER, pagingReq);
+ assertEquals("Wrong number of user draft blog posts", 1, pagedDraftResults.getPage().size());
+ NodeRef blogNode = pagedDraftResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect user draft NodeRef.", blogNode, userPosts.getFirst());
+
+ PagingResults pagedPublishedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, null, null, TEST_USER, pagingReq);
+ assertEquals("Wrong number of user published blog posts", 1, pagedPublishedResults.getPage().size());
+ blogNode = pagedPublishedResults.getPage().get(0).getNodeRef();
+ assertEquals("Incorrect user published NodeRef.", blogNode, userPosts.getSecond());
+
+ return null;
+ }
+ });
}
-
+
@Test public void getBlogPostsFilteredByDateRange() throws Exception
{
final int numberOfPosts = 31 + 31 + 29;
-
+
final List posts = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback>()
+ {
+ @Override
+ public List execute() throws Throwable
{
- @Override
- public List execute() throws Throwable
+ List results = new ArrayList();
+
+ for (int i = 0; i < numberOfPosts; i++)
{
- List results = new ArrayList();
-
- for (int i = 0; i < numberOfPosts; i++)
- {
- BlogPostInfo newBlogPost =
- BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "date-specific-post" + i, "", false);
- testNodesToTidy.add(newBlogPost.getNodeRef());
-
- results.add(newBlogPost.getNodeRef());
- }
-
- return results;
+ BlogPostInfo newBlogPost =
+ BLOG_SERVICE.createBlogPost(BLOG_CONTAINER_NODE, "date-specific-post" + i, "", false);
+ testNodesToTidy.add(newBlogPost.getNodeRef());
+
+ results.add(newBlogPost.getNodeRef());
}
- });
-
+
+ return results;
+ }
+ });
+
// Now go through and set their creation dates to specific points in the past.
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
+ // FROM 1st December 1999
+ final Calendar current = Calendar.getInstance();
+ current.set(1999, 11, 1, 11, 0);
+
+ // should give us:
+ // 31 posts in december 99
+ // 31 posts in january 00
+ // 29 posts in february 00
+
+ Date currentDate = current.getTime();
+ for (NodeRef nr : posts)
{
- // FROM 1st December 1999
- final Calendar current = Calendar.getInstance();
- current.set(1999, 11, 1, 11, 0);
-
- // should give us:
- // 31 posts in december 99
- // 31 posts in january 00
- // 29 posts in february 00
-
- Date currentDate = current.getTime();
- for (NodeRef nr : posts)
- {
- // We'll permanently turn off auditing on this node.
- // This should allow us to set the cm:created date without auditing overwriting our value.
- // These nodes get deleted after the test anyway.
- BEHAVIOUR_FILTER.disableBehaviour(nr, ContentModel.ASPECT_AUDITABLE);
-
- // Yes, cm:published will be before cm:created. But I don't think that matter.
- NODE_SERVICE.setProperty(nr, ContentModel.PROP_PUBLISHED, currentDate);
-
- current.add(Calendar.DATE, 1);
- currentDate = current.getTime();
-
- }
-
- return null;
+ // We'll permanently turn off auditing on this node.
+ // This should allow us to set the cm:created date without auditing overwriting our value.
+ // These nodes get deleted after the test anyway.
+ BEHAVIOUR_FILTER.disableBehaviour(nr, ContentModel.ASPECT_AUDITABLE);
+
+ // Yes, cm:published will be before cm:created. But I don't think that matter.
+ NODE_SERVICE.setProperty(nr, ContentModel.PROP_PUBLISHED, currentDate);
+
+ current.add(Calendar.DATE, 1);
+ currentDate = current.getTime();
+
}
- });
-
+
+ return null;
+ }
+ });
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
- {
- PagingRequest pagingReq = new PagingRequest(0, 100, null);
-
- Calendar cal = Calendar.getInstance();
- cal.set(1999, 11, 1, 0, 0, 0);
- Date firstDec99 = cal.getTime();
-
- cal.set(2000, 0, 1, 0, 0, 0);
- Date firstJan00 = cal.getTime();
-
- cal.set(2000, 1, 1, 0, 0, 0);
- Date firstFeb00 = cal.getTime();
-
- cal.set(2000, 2, 1, 0, 0, 0);
- Date firstMar00 = cal.getTime();
-
- PagingResults pagedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, firstDec99, firstJan00, null, pagingReq);
- assertEquals("Wrong number of user blog posts", 31, pagedResults.getPage().size());
-
- pagedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, firstFeb00, firstMar00, null, pagingReq);
- assertEquals("Wrong number of user blog posts", 29, pagedResults.getPage().size());
-
- pagedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, firstJan00, firstMar00, null, pagingReq);
- assertEquals("Wrong number of user blog posts", 31 + 29, pagedResults.getPage().size());
-
- return null;
- }
- });
+ PagingRequest pagingReq = new PagingRequest(0, 100, null);
+
+ Calendar cal = Calendar.getInstance();
+ cal.set(1999, 11, 1, 0, 0, 0);
+ Date firstDec99 = cal.getTime();
+
+ cal.set(2000, 0, 1, 0, 0, 0);
+ Date firstJan00 = cal.getTime();
+
+ cal.set(2000, 1, 1, 0, 0, 0);
+ Date firstFeb00 = cal.getTime();
+
+ cal.set(2000, 2, 1, 0, 0, 0);
+ Date firstMar00 = cal.getTime();
+
+ PagingResults pagedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, firstDec99, firstJan00, null, pagingReq);
+ assertEquals("Wrong number of user blog posts", 31, pagedResults.getPage().size());
+
+ pagedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, firstFeb00, firstMar00, null, pagingReq);
+ assertEquals("Wrong number of user blog posts", 29, pagedResults.getPage().size());
+
+ pagedResults = BLOG_SERVICE.getPublished(BLOG_CONTAINER_NODE, firstJan00, firstMar00, null, pagingReq);
+ assertEquals("Wrong number of user blog posts", 31 + 29, pagedResults.getPage().size());
+
+ return null;
+ }
+ });
}
-
+
/**
* Test that correct paging info is returned when searching for tagged blog posts.
*/
@@ -849,7 +783,7 @@ public class BlogServiceImplTest
return results;
}
});
-
+
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
{
@Override
@@ -860,67 +794,50 @@ public class BlogServiceImplTest
PagingResults pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, dates, tagToSearchBy, pagingReq);
assertEquals("Wrong number of blog posts on page 1 for " + tagToSearchBy, 1, pagedResults.getPage().size());
-
+
assertEquals("Wrong total number of blog posts for " + tagToSearchBy, new Pair(2, 2), pagedResults.getTotalResultCount());
-
+
assertEquals("There should still be blog posts available to be retrieved for " + tagToSearchBy, true, pagedResults.hasMoreItems());
-
+
pagingReq = new PagingRequest(1, 1, null);
pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, dates, tagToSearchBy, pagingReq);
assertEquals("Wrong number of blog posts on page 2 for " + tagToSearchBy, 1, pagedResults.getPage().size());
-
+
assertEquals("Wrong total number of blog posts for " + tagToSearchBy, new Pair(2, 2), pagedResults.getTotalResultCount());
-
+
assertEquals("All blog posts should have been retrieved by now for " + tagToSearchBy, false, pagedResults.hasMoreItems());
return null;
}
});
}
-
+
private static void createUser(final String userName)
{
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
+ {
+ @Override
+ public Void execute() throws Throwable
{
- @Override
- public Void execute() throws Throwable
+ if (!AUTHENTICATION_SERVICE.authenticationExists(userName))
{
- if (!AUTHENTICATION_SERVICE.authenticationExists(userName))
- {
- AUTHENTICATION_SERVICE.createAuthentication(userName, "PWD".toCharArray());
- }
-
- if (!PERSON_SERVICE.personExists(userName))
- {
- PropertyMap ppOne = new PropertyMap();
- ppOne.put(ContentModel.PROP_USERNAME, userName);
- ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
- ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
- ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
- ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
-
- PERSON_SERVICE.createPerson(ppOne);
- }
-
- return null;
+ AUTHENTICATION_SERVICE.createAuthentication(userName, "PWD".toCharArray());
}
- });
- }
- private static void deleteUser(final String userName)
- {
- TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
- {
- @Override
- public Void execute() throws Throwable
+ if (!PERSON_SERVICE.personExists(userName))
{
- if (PERSON_SERVICE.personExists(userName))
- {
- PERSON_SERVICE.deletePerson(userName);
- }
-
- return null;
+ PropertyMap ppOne = new PropertyMap();
+ ppOne.put(ContentModel.PROP_USERNAME, userName);
+ ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+ ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+ ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+ ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+ PERSON_SERVICE.createPerson(ppOne);
}
- });
+
+ return null;
+ }
+ });
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java b/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
index 4afe945f6f..ab532597ba 100644
--- a/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
+++ b/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
@@ -1,34 +1,30 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco 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 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Alfresco. If not, see sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
-
+
assertEquals("Expect that access tokens will match", Token, oAuth1CredentialsInfo.getOAuthToken());
assertEquals("Expect the refresh token will match", Secret, oAuth1CredentialsInfo.getOAuthSecret());
}
@@ -143,18 +130,18 @@ public class OAuth1CredentialsStoreServiceTest
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
//Update credentials
List sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
- OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
+ OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
}
-
+
//public void testUpdateSharedOAuth1Credentials()
{
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
//Update credentials
List sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
- OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
+ OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
OAuth1CredentialsInfo _oAuth1CredentialsInfo = oauth1CredentialsStoreService.updateSharedOAuth1Credentials(oAuth1CredentialsInfo, RemoteSystemId, UpdatedToken, UpdatedSecret);
-
+
assertEquals("Expect that access tokens will match", UpdatedToken, _oAuth1CredentialsInfo.getOAuthToken());
assertEquals("Expect the refresh token will match", UpdatedSecret, _oAuth1CredentialsInfo.getOAuthSecret());
}
@@ -165,12 +152,12 @@ public class OAuth1CredentialsStoreServiceTest
{
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
boolean deleted = oauth1CredentialsStoreService.deletePersonalOAuth1Credentials(RemoteSystemId);
-
+
assertTrue(deleted);
-
+
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
boolean _deleted = oauth1CredentialsStoreService.deletePersonalOAuth1Credentials(RemoteSystemId);
-
+
assertFalse(_deleted);
}
@@ -188,60 +175,42 @@ public class OAuth1CredentialsStoreServiceTest
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
List sharedCredentials = oauth1CredentialsStoreService.listSharedOAuth1Credentials(RemoteSystemId);
OAuth1CredentialsInfo oAuth1CredentialsInfo = sharedCredentials.get(0);
- boolean deleted = oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
-
+ boolean deleted = oauth1CredentialsStoreService.deleteSharedOAuth1Credentials(RemoteSystemId, oAuth1CredentialsInfo);
+
assertTrue(deleted);
}
}
-
- // --------------------------------------------------------------------------------
-
-
+
+ // --------------------------------------------------------------------------------
+
+
private static void createUser(final String userName)
{
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
{
- @Override
- public Void execute() throws Throwable
- {
- if (!authenticationService.authenticationExists(userName))
- {
- authenticationService.createAuthentication(userName, "PWD".toCharArray());
- }
+ @Override
+ public Void execute() throws Throwable
+ {
+ if (!authenticationService.authenticationExists(userName))
+ {
+ authenticationService.createAuthentication(userName, "PWD".toCharArray());
+ }
- if (!personService.personExists(userName))
- {
- PropertyMap ppOne = new PropertyMap();
- ppOne.put(ContentModel.PROP_USERNAME, userName);
- ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
- ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
- ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
- ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+ if (!personService.personExists(userName))
+ {
+ PropertyMap ppOne = new PropertyMap();
+ ppOne.put(ContentModel.PROP_USERNAME, userName);
+ ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+ ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+ ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+ ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
- personService.createPerson(ppOne);
- }
+ personService.createPerson(ppOne);
+ }
- return null;
- }
+ return null;
+ }
});
}
-
- private static void deleteUser(final String userName)
- {
- transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
- {
- @Override
- public Void execute() throws Throwable
- {
- if (personService.personExists(userName))
- {
- personService.deletePerson(userName);
- }
-
- return null;
- }
- });
- }
-
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java b/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
index 7a26c2a491..2e25679547 100644
--- a/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
+++ b/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco 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 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Alfresco. If not, see sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
-
+
assertEquals("Expect that access tokens will match", AccessToken, oAuth2CredentialsInfo.getOAuthAccessToken());
assertEquals("Expect the refresh token will match", RefreshToken, oAuth2CredentialsInfo.getOAuthRefreshToken());
assertEquals("Expect that the expiration date will match", ExpiresAt, oAuth2CredentialsInfo.getOAuthTicketExpiresAt());
@@ -152,10 +150,10 @@ public class OAuth2CredentialsStoreServiceTest
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
//Update credentials
List sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
- OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
+ OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
oauth2CredentialsStoreService.updateSharedOAuth2Credentials(oAuth2CredentialsInfo, RemoteSystemId, UpdatedAccessToken, UpdatedRefreshToken, UpdatedExpiresAt, UpdatedIssuedAt);
}
-
+
@Test
public void testUpdateSharedOAuth2CredentialsTestDeletePesonalOAuth2Credentials()
{
@@ -163,25 +161,25 @@ public class OAuth2CredentialsStoreServiceTest
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
//Update credentials
List sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
- OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
+ OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
OAuth2CredentialsInfo _oAuth2CredentialsInfo = oauth2CredentialsStoreService.updateSharedOAuth2Credentials(oAuth2CredentialsInfo, RemoteSystemId, UpdatedAccessToken, UpdatedRefreshToken, UpdatedExpiresAt, UpdatedIssuedAt);
-
+
assertEquals("Expect that access tokens will match", UpdatedAccessToken, _oAuth2CredentialsInfo.getOAuthAccessToken());
assertEquals("Expect the refresh token will match", UpdatedRefreshToken, _oAuth2CredentialsInfo.getOAuthRefreshToken());
assertEquals("Expect that the expiration date will match", UpdatedExpiresAt, _oAuth2CredentialsInfo.getOAuthTicketExpiresAt());
assertEquals("Expect that the issued date will match", UpdatedIssuedAt, _oAuth2CredentialsInfo.getOAuthTicketIssuedAt());
}
-
+
//public void testDeletePesonalOAuth2Credentials()
{
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
boolean deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
-
+
assertTrue(deleted);
-
+
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_TWO);
boolean _deleted = oauth2CredentialsStoreService.deletePersonalOAuth2Credentials(RemoteSystemId);
-
+
assertFalse(_deleted);
}
}
@@ -195,66 +193,48 @@ public class OAuth2CredentialsStoreServiceTest
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo);
}
-
+
//public void testDeleteSharedOAuth2Credentials()
{
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER_ONE);
List sharedCredentials = oauth2CredentialsStoreService.listSharedOAuth2Credentials(RemoteSystemId);
OAuth2CredentialsInfo oAuth2CredentialsInfo = sharedCredentials.get(0);
- boolean deleted = oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo);
-
+ boolean deleted = oauth2CredentialsStoreService.deleteSharedOAuth2Credentials(RemoteSystemId, oAuth2CredentialsInfo);
+
assertTrue(deleted);
}
}
-
- // --------------------------------------------------------------------------------
-
-
+
+ // --------------------------------------------------------------------------------
+
+
private static void createUser(final String userName)
{
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
{
- @Override
- public Void execute() throws Throwable
- {
- if (!authenticationService.authenticationExists(userName))
- {
- authenticationService.createAuthentication(userName, "PWD".toCharArray());
- }
+ @Override
+ public Void execute() throws Throwable
+ {
+ if (!authenticationService.authenticationExists(userName))
+ {
+ authenticationService.createAuthentication(userName, "PWD".toCharArray());
+ }
- if (!personService.personExists(userName))
- {
- PropertyMap ppOne = new PropertyMap();
- ppOne.put(ContentModel.PROP_USERNAME, userName);
- ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
- ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
- ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
- ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+ if (!personService.personExists(userName))
+ {
+ PropertyMap ppOne = new PropertyMap();
+ ppOne.put(ContentModel.PROP_USERNAME, userName);
+ ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+ ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+ ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+ ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
- personService.createPerson(ppOne);
- }
+ personService.createPerson(ppOne);
+ }
- return null;
- }
+ return null;
+ }
});
}
-
- private static void deleteUser(final String userName)
- {
- transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback()
- {
- @Override
- public Void execute() throws Throwable
- {
- if (personService.personExists(userName))
- {
- personService.deletePerson(userName);
- }
-
- return null;
- }
- });
- }
-
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java b/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java
index beb658ac90..c4fc313511 100644
--- a/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java
+++ b/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java
@@ -25,11 +25,6 @@
*/
package org.alfresco.repo.rawevents;
-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 java.util.Locale;
import org.alfresco.model.ContentModel;
@@ -44,7 +39,6 @@ import org.alfresco.repo.rawevents.types.EventType;
import org.alfresco.repo.rawevents.types.OnContentUpdatePolicyEvent;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentService;
@@ -53,64 +47,49 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
-import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.After;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-import org.springframework.context.ApplicationContext;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* Provides a base set of tests for {@link EventBehaviour}
- *
+ *
* @author Cristian Turlica
*/
-@Category(OwnJVMTestsCategory.class)
-public class EventBehaviourTest
+public class EventBehaviourTest extends BaseSpringTest
{
private static final String TEST_NAMESPACE = "http://www.alfresco.org/test/EventBehaviourTest";
+ @Autowired
private RetryingTransactionHelper retryingTransactionHelper;
+ @Autowired
private ContentService contentService;
+ @Autowired
private PolicyComponent policyComponent;
+ @Autowired
private NodeService nodeService;
+ @Autowired
private AuthenticationComponent authenticationComponent;
private NodeRef rootNodeRef;
private NodeRef contentNodeRef;
+ @Autowired
private CamelContext camelContext;
+ @Autowired
private AbstractEventProducer eventProducer;
- private ObjectMapper messagingObjectMapper;
private boolean policyFired = false;
private boolean newContent = true;
- @Rule
- public TestName name = new TestName();
-
@Before
public void setUp() throws Exception
{
- ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
- retryingTransactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper");
- nodeService = (NodeService) ctx.getBean("NodeService");
- contentService = (ContentService) ctx.getBean(ServiceRegistry.CONTENT_SERVICE.getLocalName());
- policyComponent = (PolicyComponent) ctx.getBean("policyComponent");
- authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
-
- camelContext = (CamelContext) ctx.getBean("alfrescoCamelContext");
- eventProducer = (AbstractEventProducer) ctx.getBean("transactionAwareEventProducer");
- messagingObjectMapper = (ObjectMapper) ctx.getBean("alfrescoEventObjectMapper");
-
// authenticate
authenticationComponent.setSystemUserAsCurrentUser();
}
@@ -142,7 +121,7 @@ public class EventBehaviourTest
private void setupTestData()
{
// create a store and get the root node
- StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, name.getMethodName());
+ StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, this.getClass().getName());
if (!nodeService.exists(storeRef))
{
storeRef = nodeService.createStore(storeRef.getProtocol(), storeRef.getIdentifier());
@@ -397,7 +376,7 @@ public class EventBehaviourTest
private String getMockEndpointUri()
{
- return "mock:" + this.getClass().getSimpleName() + "_" + name.getMethodName();
+ return "mock:" + this.getClass().getSimpleName() + "_" + GUID.generate();
}
@SuppressWarnings("unused")
@@ -418,4 +397,4 @@ public class EventBehaviourTest
return event;
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java b/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java
index 0e0810fbd5..70d88acb7c 100644
--- a/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java
+++ b/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java
@@ -25,23 +25,15 @@
*/
package org.alfresco.repo.rawevents;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import org.alfresco.repo.rawevents.types.EventType;
import org.alfresco.repo.rawevents.types.OnContentUpdatePolicyEvent;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.test_category.OwnJVMTestsCategory;
-import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -50,27 +42,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*
* @author Cristian Turlica
*/
-@Category(OwnJVMTestsCategory.class)
-public class TransactionAwareEventProducerTest
+public class TransactionAwareEventProducerTest extends BaseSpringTest
{
+ @Autowired
private RetryingTransactionHelper retryingTransactionHelper;
+ @Autowired
private CamelContext camelContext;
+ @Autowired
private TransactionAwareEventProducer eventProducer;
+ @Autowired
private ObjectMapper messagingObjectMapper;
- @Rule
- public TestName name = new TestName();
-
- @Before
- public void setUp() throws Exception
- {
- ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
- retryingTransactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper");
- camelContext = (CamelContext) ctx.getBean("alfrescoCamelContext");
- eventProducer = (TransactionAwareEventProducer) ctx.getBean("transactionAwareEventProducer");
- messagingObjectMapper = (ObjectMapper) ctx.getBean("alfrescoEventObjectMapper");
- }
-
@Test
public void send() throws Exception
{
@@ -127,6 +109,6 @@ public class TransactionAwareEventProducerTest
private String getMockEndpointUri()
{
- return "mock:" + this.getClass().getSimpleName() + "_" + name.getMethodName();
+ return "mock:" + this.getClass().getSimpleName() + "_" + GUID.generate();
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java b/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java
index ee723fb257..34a9821fad 100644
--- a/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java
+++ b/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java
@@ -115,10 +115,6 @@ public abstract class AbstractRenditionIntegrationTest extends BaseSpringTest
@BeforeClass
public static void before()
{
- // Ensure other applications contexts are closed...
- // Multiple consumers not supported for same direct vm in different Camel contexts.
- ApplicationContextHelper.closeApplicationContext();
-
// Use the docker images for transforms
System.setProperty("alfresco-pdf-renderer.url", "http://localhost:8090/");
System.setProperty("img.url", "http://localhost:8091");
diff --git a/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java b/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java
index 06c7d88a89..96883f007e 100644
--- a/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java
+++ b/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java
@@ -25,7 +25,6 @@
*/
package org.alfresco.repo.rendition2;
-import junit.framework.TestCase;
import org.alfresco.repo.content.transform.swf.SWFTransformationOptions;
import org.alfresco.repo.rendition.RenditionServiceImpl;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
@@ -34,14 +33,16 @@ import org.alfresco.repo.thumbnail.ThumbnailRenditionConvertor;
import org.alfresco.service.cmr.rendition.RenditionDefinition;
import org.alfresco.service.cmr.rendition.RenditionService;
import org.alfresco.service.cmr.repository.TransformationOptions;
-import org.alfresco.util.ApplicationContextHelper;
-import org.springframework.context.ApplicationContext;
+import org.alfresco.util.BaseSpringTest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringJoiner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests that the replacement {@link RenditionDefinition2} generates the same {@link TransformationOptions} as the
@@ -52,28 +53,26 @@ import java.util.StringJoiner;
* @author adavis
*/
@Deprecated
-public class RenditionDefinitionTest extends TestCase
+public class RenditionDefinitionTest extends BaseSpringTest
{
private RenditionServiceImpl renditionService;
private RenditionDefinitionRegistry2 renditionDefinitionRegistry2;
private TransformationOptionsConverter transformationOptionsConverter;
- private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
-
private AuthenticationComponent authenticationComponent;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- authenticationComponent = (AuthenticationComponent) ctx.getBean("AuthenticationComponent");
- renditionService = (RenditionServiceImpl) ctx.getBean("renditionService");
- renditionDefinitionRegistry2 = (RenditionDefinitionRegistry2) ctx.getBean("renditionDefinitionRegistry2");
- transformationOptionsConverter = (TransformationOptionsConverter) ctx.getBean("transformOptionsConverter");
+ authenticationComponent = (AuthenticationComponent) applicationContext.getBean("AuthenticationComponent");
+ renditionService = (RenditionServiceImpl) applicationContext.getBean("renditionService");
+ renditionDefinitionRegistry2 = (RenditionDefinitionRegistry2) applicationContext.getBean("renditionDefinitionRegistry2");
+ transformationOptionsConverter = (TransformationOptionsConverter) applicationContext.getBean("transformOptionsConverter");
authenticationComponent.setSystemUserAsCurrentUser();
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
try
{
@@ -98,6 +97,7 @@ public class RenditionDefinitionTest extends TestCase
return null;
}
+ @Test
public void testGetRenderingEngineDefinition() throws Exception
{
ThumbnailRenditionConvertor converter = new ThumbnailRenditionConvertor();
diff --git a/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java b/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java
index 129814cddf..e9de62a877 100644
--- a/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java
+++ b/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java
@@ -4,21 +4,21 @@
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco 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 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco 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 Alfresco. If not, see assocRefs = BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
@@ -291,7 +289,7 @@ public class SearcherComponentTest extends TestCase
xpath.addNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
list = xpath.selectNodes(assocRefs.get(qname));
assertEquals(1, list.size());
-
+
xpathStr = "test:root_p_n1 | test:root_p_n2";
xpath = new NodeServiceXPath(xpathStr, documentNavigator, null);
xpath.addNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
@@ -299,6 +297,7 @@ public class SearcherComponentTest extends TestCase
assertEquals(2, list.size());
}
+ @Test
public void testSelectAPI() throws Exception
{
Map assocRefs = BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
@@ -319,33 +318,33 @@ public class SearcherComponentTest extends TestCase
List attributes = searcher.selectProperties(rootNodeRef, "//@test:animal", null,
namespacePrefixResolver, false);
assertEquals(1, attributes.size());
-
+
NodeRef n1 = assocRefs.get(QName.createQName(BaseNodeServiceTest.NAMESPACE, "root_p_n1")).getChildRef();
NodeRef n2 = assocRefs.get(QName.createQName(BaseNodeServiceTest.NAMESPACE, "root_p_n2")).getChildRef();
-
+
answer = searcher.selectNodes(rootNodeRef, "test:root_p_n1 | test:root_p_n2", null, namespacePrefixResolver, false);
assertEquals(2, answer.size());
assertTrue(answer.contains(n1));
assertTrue(answer.contains(n2));
-
+
NodeRef n3 = assocRefs.get(QName.createQName(BaseNodeServiceTest.NAMESPACE, "n1_p_n3")).getChildRef();
-
+
answer = searcher.selectNodes(rootNodeRef, "//@test:animal", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
-
+
answer = searcher.selectNodes(rootNodeRef, "*//.[@test:animal]", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
-
+
answer = searcher.selectNodes(rootNodeRef, "*//.[@test:animal='monkey']", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
-
+
answer = searcher.selectNodes(rootNodeRef, "//.[@test:animal='monkey']", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
-
+
answer = searcher.selectNodes(rootNodeRef, "*//.[@test:animal='monkey']", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n3));
@@ -354,23 +353,23 @@ public class SearcherComponentTest extends TestCase
// answer = searcher.selectNodes(rootNodeRef, "//*[like(@test:animal, 'monk*')]", null, namespacePrefixResolver, false);
// assertEquals(1, answer.size());
// assertTrue(answer.contains(n3));
-
+
answer = searcher.selectNodes(rootNodeRef, "//@*", null, namespacePrefixResolver, false);
assertEquals(9, answer.size());
-
+
QName qname = QName.createQName(BaseNodeServiceTest.NAMESPACE, "my@test_with_at_sign");
-
+
Map properties = new HashMap();
properties.put(QName.createQName(BaseNodeServiceTest.NAMESPACE, "mytest"), "my@test_value_with_at_sign");
-
+
ChildAssociationRef assoc = nodeService.createNode(n1, BaseNodeServiceTest.ASSOC_TYPE_QNAME_TEST_CHILDREN, qname, ContentModel.TYPE_CONTAINER, properties);
NodeRef n4 = assoc.getChildRef();
-
+
StringBuffer path = new StringBuffer().append("test:root_p_n1/").append(ISO9075.getXPathName(qname, namespacePrefixResolver));
answer = searcher.selectNodes(rootNodeRef, path.toString(), null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
assertTrue(answer.contains(n4));
-
+
String xpathQuery = "//*[@test:mytest='my@test_value_with_at_sign']";
answer = searcher.selectNodes(rootNodeRef, xpathQuery, null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
@@ -409,9 +408,9 @@ public class SearcherComponentTest extends TestCase
{
System.out.println("Char at "+i+" = "+Integer.toHexString(COMPLEX_LOCAL_NAME.charAt(i))+ " ... "+Integer.toHexString(roundTrip.charAt(i)));
}
-
+
assertEquals( COMPLEX_LOCAL_NAME, roundTrip);
-
+
answer = searcher.selectNodes(rootNodeRef, "//*[like(@test:"
+ ISO9075.encode(COMPLEX_LOCAL_NAME) + ", 'm__k%', false)]", null, namespacePrefixResolver, false);
assertEquals(1, answer.size());
@@ -513,4 +512,4 @@ public class SearcherComponentTest extends TestCase
builder.append("\"");
System.out.println(builder.toString());
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java b/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
index d94714f43e..abab9c9eb7 100644
--- a/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
+++ b/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
@@ -4,21 +4,21 @@
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco 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 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco 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 Alfresco. If not, see aclChangeSets = getAclChangeSets(null, null, null, null, 50);
@@ -145,9 +142,10 @@ public class SOLRTrackingComponentTest extends TestCase
}
- // This test is no longer valid as we may or may include shared acls not linked to defining ones
+ // This test is no longer valid as we may or may include shared acls not linked to defining ones
// If they are not linked to a node they will be counted wring ...
-
+
+// @Test
// public void testGetAcls_Simple()
// {
// List cs = getAclChangeSets(null, null, null, null, 50);
@@ -158,18 +156,19 @@ public class SOLRTrackingComponentTest extends TestCase
// totalAcls += aclChangeSet.getAclCount();
// }
// int totalAclsCheck = 0;
-//
+//
// for (AclChangeSet aclChangeSet : cs)
// {
// List acls = getAcls(Arrays.asList(new Long[]{aclChangeSet.getId()}), null, 200);
// assertEquals(aclChangeSet.getAclCount(), acls.size());
// totalAclsCheck += acls.size();
// }
-//
+//
// // Double check number of ACLs
// assertEquals("ACL count should have matched", totalAcls, totalAclsCheck);
// }
+ @Test
public void testGetNodeMetaData()
{
long startTime = System.currentTimeMillis();
@@ -205,7 +204,7 @@ public class SOLRTrackingComponentTest extends TestCase
}
return txIds;
}
-
+
/**
* Call {@link SOLRTrackingComponent#getTransactions(Long, Long, Long, Long, int)} in a transaction
*/
@@ -283,6 +282,7 @@ public class SOLRTrackingComponentTest extends TestCase
return transactionService.getRetryingTransactionHelper().doInTransaction(callback, true);
}
+ @Test
public void testGetTransactionLimits()
{
long startTime = System.currentTimeMillis();
@@ -341,6 +341,7 @@ public class SOLRTrackingComponentTest extends TestCase
assertEquals(0, txns.size());
}
+ @Test
public void testGetNodeMetaDataExludesResidualProperties()
{
long startTime = System.currentTimeMillis();
@@ -365,6 +366,7 @@ public class SOLRTrackingComponentTest extends TestCase
}
+ @Test
public void testGetNodeMetaData100Nodes()
{
long startTime = System.currentTimeMillis();
@@ -394,6 +396,8 @@ public class SOLRTrackingComponentTest extends TestCase
// assertEquals("Unxpected number of nodes", 3, bt.getSuccessCount());
}
+ @Category(PerformanceTests.class)
+ @Test
public void testNodeMetaDataManyNodes() throws Exception
{
long fromCommitTime = System.currentTimeMillis();
@@ -427,21 +431,21 @@ public class SOLRTrackingComponentTest extends TestCase
nodeMetaDataParams.setMaxResults(800);
getNodeMetaData(nodeMetaDataParams, null, st);
getNodeMetaData(nodeMetaDataParams, null, st);
- logger.debug("Warm cache");
+ logger.debug("Warm cache");
getNodeMetaData(nodeMetaDataParams, null, st);
logger.debug("Cold cache - explicit clear");
nodeMetaDataParams.setMaxResults(500);
getNodeMetaData(nodeMetaDataParams, null, st);
getNodeMetaData(nodeMetaDataParams, null, st);
- logger.debug("Warm cache");
+ logger.debug("Warm cache");
getNodeMetaData(nodeMetaDataParams, null, st);
logger.debug("Cold cache - explicit clear");
nodeMetaDataParams.setMaxResults(200);
getNodeMetaData(nodeMetaDataParams, null, st);
getNodeMetaData(nodeMetaDataParams, null, st);
- logger.debug("Warm cache");
+ logger.debug("Warm cache");
getNodeMetaData(nodeMetaDataParams, null, st);
// clear out node caches
@@ -451,6 +455,8 @@ public class SOLRTrackingComponentTest extends TestCase
getNodeMetaData(nodeMetaDataParams, null, st);
}
+ @Category(PerformanceTests.class)
+ @Test
public void testNodeMetaDataCache() throws Exception
{
long fromCommitTime = System.currentTimeMillis();
@@ -481,6 +487,7 @@ public class SOLRTrackingComponentTest extends TestCase
getNodeMetaData(nodeMetaDataParams, filter, st);
}
+ @Test
public void testNodeMetaDataNullPropertyValue() throws Exception
{
long fromCommitTime = System.currentTimeMillis();
@@ -503,6 +510,7 @@ public class SOLRTrackingComponentTest extends TestCase
getNodeMetaData(nodeMetaDataParams, null, st);
}
+ @Test
public void testFilters()
{
long startTime = System.currentTimeMillis();
@@ -525,6 +533,7 @@ public class SOLRTrackingComponentTest extends TestCase
getNodeMetaData(nodeMetaDataParams, null, st);
}
+ @Test
public void testModelDiffs()
{
Collection allModels = dictionaryService.getAllModels();
@@ -573,7 +582,7 @@ public class SOLRTrackingComponentTest extends TestCase
assertEquals("Old checksum value is incorrect", testModelChecksum.longValue(), changedModel.getOldChecksum().longValue());
assertNotSame("Expected checksums to be different", changedModel.getOldChecksum(), changedModel.getNewChecksum());
- // remove the model
+ // remove the model
dictionaryDAO.removeModel(QName.createQName(testModel.getName(), namespaceService));
// call model diffs - check that the model has been removed
@@ -765,14 +774,14 @@ public class SOLRTrackingComponentTest extends TestCase
long startTime = System.currentTimeMillis();
txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
@Override
public Void execute() throws Throwable
{
solrTrackingComponent.getNodesMetadata(params, filter, bt);
return null;
}
- }, true, true);
+ }, true, true);
long endTime = System.currentTimeMillis();
bt.runNodeMetaDataChecks(params.getMaxResults());
@@ -811,7 +820,7 @@ public class SOLRTrackingComponentTest extends TestCase
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
this.txnHelper = txnHelper;
this.nodeService = nodeService;
this.rootNodeRef = rootNodeRef;
@@ -827,7 +836,7 @@ public class SOLRTrackingComponentTest extends TestCase
this.doNodeChecks = doNodeChecks;
this.doMetaDataChecks = doMetaDataChecks;
this.doChecks = doNodeChecks || doMetaDataChecks;
- }
+ }
void runNodeChecks(int maxResults)
{
@@ -901,14 +910,14 @@ public class SOLRTrackingComponentTest extends TestCase
{
expectedNumMetaDataNodes++;
}
-
+
/*
if(nodeStatus == NodeStatus.DELETED)
{
expectedNumMetaDataNodes++;
}
*/
-
+
if(doChecks)
{
NodeAssertions nodeAssertions = getNodeAssertions(nodeRef);
@@ -1017,7 +1026,7 @@ public class SOLRTrackingComponentTest extends TestCase
// List actualPaths = nodeMetaData.getPaths();
// List expectedPaths = nodeService.getPaths(nodeRef, false);
// assertEquals("Paths are incorrect", expectedPaths, actualPaths);
-
+
// Include negative checks i.e. make sure we get null if we do NOT expect paths
boolean expectPaths = assertions.isExpectPaths();
assertTrue("Expecting paths but didn't get any.", expectPaths == (nodeMetaData.getPaths() != null));
@@ -1025,7 +1034,7 @@ public class SOLRTrackingComponentTest extends TestCase
if (expectPaths)
{
// Check QName paths
- // TODO: Check paths
+ // TODO: Check paths
// Check name paths
Collection> namePaths = nodeMetaData.getNamePaths();
if (nodeService.getProperty(nodeRef, ContentModel.PROP_NAME) == null)
@@ -1137,9 +1146,9 @@ public class SOLRTrackingComponentTest extends TestCase
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
super(txnHelper, fileFolderService, nodeDAO, qnameDAO, nodeService, dictionaryService, rootNodeRef, containerName, doNodeChecks, doMetaDataChecks);
- }
+ }
public int getExpectedNumNodes()
{
@@ -1151,7 +1160,7 @@ public class SOLRTrackingComponentTest extends TestCase
ArrayList txs = new ArrayList(2);
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
PropertyMap props = new PropertyMap();
@@ -1168,10 +1177,10 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(content1).getDbTxnId();
}
- }));
+ }));
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
FileInfo contentInfo = fileFolderService.create(container, "Content2", ContentModel.TYPE_CONTENT);
@@ -1181,7 +1190,7 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(content1).getDbTxnId();
}
- }));
+ }));
setExpectedNodeStatus(container, NodeStatus.UPDATED);
setExpectedNodeStatus(content1, NodeStatus.DELETED);
@@ -1198,11 +1207,11 @@ public class SOLRTrackingComponentTest extends TestCase
SOLRTest3(
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
- NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
+ NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
super(txnHelper, fileFolderService, nodeDAO, qnameDAO, nodeService, dictionaryService, rootNodeRef, containerName, doNodeChecks, doMetaDataChecks);
- }
+ }
public int getExpectedNumNodes()
{
@@ -1214,7 +1223,7 @@ public class SOLRTrackingComponentTest extends TestCase
ArrayList txs = new ArrayList(2);
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
PropertyMap props = new PropertyMap();
@@ -1235,10 +1244,10 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(content1).getDbTxnId();
}
- }));
+ }));
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
FileInfo contentInfo = fileFolderService.create(container, "Content2", ContentModel.TYPE_CONTENT);
@@ -1249,7 +1258,7 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(content1).getDbTxnId();
}
- }));
+ }));
setExpectedNodeStatus(container, NodeStatus.UPDATED);
setExpectedNodeStatus(content1, NodeStatus.DELETED);
@@ -1265,9 +1274,9 @@ public class SOLRTrackingComponentTest extends TestCase
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
super(txnHelper, fileFolderService, nodeDAO, qnameDAO, nodeService, dictionaryService, rootNodeRef, containerName, doNodeChecks, doMetaDataChecks);
- }
+ }
public int getExpectedNumNodes()
{
@@ -1279,7 +1288,7 @@ public class SOLRTrackingComponentTest extends TestCase
ArrayList txs = new ArrayList(2);
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
PropertyMap props = new PropertyMap();
@@ -1302,7 +1311,7 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(container).getDbTxnId();
}
- }));
+ }));
return txs;
}
}
@@ -1315,9 +1324,9 @@ public class SOLRTrackingComponentTest extends TestCase
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
super(txnHelper, fileFolderService, nodeDAO, qnameDAO, nodeService, dictionaryService, rootNodeRef, containerName, doNodeChecks, doMetaDataChecks);
- }
+ }
public int getExpectedNumNodes()
{
@@ -1329,7 +1338,7 @@ public class SOLRTrackingComponentTest extends TestCase
ArrayList txs = new ArrayList(2);
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
PropertyMap props = new PropertyMap();
@@ -1358,7 +1367,7 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(container).getDbTxnId();
}
- }));
+ }));
return txs;
}
@@ -1372,9 +1381,9 @@ public class SOLRTrackingComponentTest extends TestCase
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
super(txnHelper, fileFolderService, nodeDAO, qnameDAO, nodeService, dictionaryService, rootNodeRef, containerName, doNodeChecks, doMetaDataChecks);
- }
+ }
public int getExpectedNumNodes()
{
@@ -1385,13 +1394,13 @@ public class SOLRTrackingComponentTest extends TestCase
{
ArrayList txs = new ArrayList(2);
- final String titles[] =
- {
- "caf\u00E9", "\u00E7edilla", "\u00E0\u00E1\u00E2\u00E3", "\u00EC\u00ED\u00EE\u00EF", "\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6",
- "caf\u00E9", "\u00E7edilla", "\u00E0\u00E1\u00E2\u00E3", "\u00EC\u00ED\u00EE\u00EF", "\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6"
- };
- txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
+ final String titles[] =
{
+ "caf\u00E9", "\u00E7edilla", "\u00E0\u00E1\u00E2\u00E3", "\u00EC\u00ED\u00EE\u00EF", "\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6",
+ "caf\u00E9", "\u00E7edilla", "\u00E0\u00E1\u00E2\u00E3", "\u00EC\u00ED\u00EE\u00EF", "\u00F0\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6"
+ };
+ txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
+ {
public Long execute() throws Throwable
{
PropertyMap props = new PropertyMap();
@@ -1426,7 +1435,7 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(container).getDbTxnId();
}
- }));
+ }));
return txs;
}
@@ -1441,9 +1450,9 @@ public class SOLRTrackingComponentTest extends TestCase
RetryingTransactionHelper txnHelper, FileFolderService fileFolderService,
NodeDAO nodeDAO, QNameDAO qnameDAO, NodeService nodeService, DictionaryService dictionaryService,
NodeRef rootNodeRef, String containerName, boolean doNodeChecks, boolean doMetaDataChecks)
- {
+ {
super(txnHelper, fileFolderService, nodeDAO, qnameDAO, nodeService, dictionaryService,rootNodeRef, containerName, doNodeChecks, doMetaDataChecks);
- }
+ }
public int getExpectedNumNodes()
{
@@ -1455,7 +1464,7 @@ public class SOLRTrackingComponentTest extends TestCase
ArrayList txs = new ArrayList(2);
txs.add(txnHelper.doInTransaction(new RetryingTransactionCallback()
- {
+ {
public Long execute() throws Throwable
{
PropertyMap props = new PropertyMap();
@@ -1474,7 +1483,7 @@ public class SOLRTrackingComponentTest extends TestCase
return nodeDAO.getNodeRefStatus(container).getDbTxnId();
}
- }));
+ }));
setExpectedNodeStatus(container, NodeStatus.UPDATED);
setExpectedNodeStatus(content, NodeStatus.UPDATED);
@@ -1482,4 +1491,4 @@ public class SOLRTrackingComponentTest extends TestCase
return txs;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java b/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
index 9f427b083d..fbcb162b4c 100644
--- a/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
+++ b/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
@@ -4,21 +4,21 @@
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco 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 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco 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 Alfresco. If not, see folderProps = new HashMap(1);
folderProps.put(ContentModel.PROP_NAME, "testFolder" + guid);
folder = nodeService.createNode(
- TaggingServiceImplTest.rootNode,
- ContentModel.ASSOC_CHILDREN,
+ TaggingServiceImplTest.rootNode,
+ ContentModel.ASSOC_CHILDREN,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "testFolder" + guid),
ContentModel.TYPE_FOLDER,
folderProps).getChildRef();
-
+
// Create a node
Map docProps = new HashMap(1);
docProps.put(ContentModel.PROP_NAME, "testDocument" + guid + ".txt");
document = nodeService.createNode(
- folder,
- ContentModel.ASSOC_CONTAINS,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "testDocument" + guid + ".txt"),
+ folder,
+ ContentModel.ASSOC_CONTAINS,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "testDocument" + guid + ".txt"),
ContentModel.TYPE_CONTENT,
- docProps).getChildRef();
-
+ docProps).getChildRef();
+
Map props = new HashMap(1);
props.put(ContentModel.PROP_NAME, "subFolder" + guid);
subFolder = nodeService.createNode(
- folder,
- ContentModel.ASSOC_CONTAINS,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subFolder" + guid),
+ folder,
+ ContentModel.ASSOC_CONTAINS,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subFolder" + guid),
ContentModel.TYPE_FOLDER,
props).getChildRef();
-
+
props = new HashMap(1);
props.put(ContentModel.PROP_NAME, "subDocument" + guid + ".txt");
subDocument = nodeService.createNode(
- subFolder,
- ContentModel.ASSOC_CONTAINS,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subDocument" + guid + ".txt"),
+ subFolder,
+ ContentModel.ASSOC_CONTAINS,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subDocument" + guid + ".txt"),
ContentModel.TYPE_CONTENT,
props).getChildRef();
return null;
@@ -313,27 +302,27 @@ public class TaggingServiceImplTest
{
// Authenticate as the system user
authenticationComponent.setSystemUserAsCurrentUser();
-
+
// If anything is a tag scope, stop it being
NodeRef[] nodes = new NodeRef[] { subDocument, subFolder, document, folder };
for(NodeRef nodeRef : nodes)
{
- if(taggingService.isTagScope(nodeRef))
- {
- taggingService.removeTagScope(nodeRef);
- }
+ if(taggingService.isTagScope(nodeRef))
+ {
+ taggingService.removeTagScope(nodeRef);
+ }
}
-
+
// Remove the sample nodes
for(NodeRef nodeRef : nodes)
{
- nodeService.deleteNode(nodeRef);
+ nodeService.deleteNode(nodeRef);
}
-
+
// Tidy up the audit component, now all the nodes have gone
auditService.clearAudit(
- TaggingServiceImpl.TAGGING_AUDIT_APPLICATION_NAME,
- 0l, System.currentTimeMillis()+1
+ TaggingServiceImpl.TAGGING_AUDIT_APPLICATION_NAME,
+ 0l, System.currentTimeMillis()+1
);
return null;
}
@@ -343,7 +332,7 @@ public class TaggingServiceImplTest
@Test
@Category({RedundantTests.class,LuceneTests.class})
public void test1TagCRUD()
- throws Exception
+ throws Exception
{
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@@ -354,11 +343,11 @@ public class TaggingServiceImplTest
List tags = taggingService.getTags(TaggingServiceImplTest.storeRef);
assertNotNull(tags);
assertEquals(0, tags.size());
-
+
// Create a tag
taggingService.createTag(TaggingServiceImplTest.storeRef, TAG_1);
taggingService.createTag(TaggingServiceImplTest.storeRef, UPPER_TAG);
-
+
return null;
}
});
@@ -374,7 +363,7 @@ public class TaggingServiceImplTest
assertEquals(2, tags.size());
assertTrue(tags.contains(TAG_1));
assertTrue(tags.contains(LOWER_TAG));
-
+
// Get Paged tags with filter
Pair, Integer> pagedTags = taggingService.getPagedTags(TaggingServiceImplTest.storeRef, "one", 0 ,10);
assertNotNull(pagedTags);
@@ -397,25 +386,25 @@ public class TaggingServiceImplTest
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_1));
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, UPPER_TAG));
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, LOWER_TAG));
-
+
// Remove a tag
taggingService.deleteTag(TaggingServiceImplTest.storeRef, UPPER_TAG);
return null;
}
});
-
+
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@Override
public Void execute() throws Throwable
- {
+ {
// Get all the tags
List tags = taggingService.getTags(TaggingServiceImplTest.storeRef);
assertNotNull(tags);
assertEquals(1, tags.size());
assertTrue(tags.contains(TAG_1));
assertFalse(tags.contains(LOWER_TAG));
-
+
// Check isTag method
assertFalse(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_2));
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_1));
@@ -429,39 +418,39 @@ public class TaggingServiceImplTest
@Test
@Category({RedundantTests.class,LuceneTests.class})
public void test2AddRemoveTag()
- throws Exception
+ throws Exception
{
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@Override
public Void execute() throws Throwable
- {
+ {
List tags = taggingService.getTags(document);
assertNotNull(tags);
assertTrue(tags.isEmpty());
assertFalse(taggingService.hasTag(document, TAG_1));
-
+
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_1));
taggingService.addTag(document, TAG_1);
-
+
tags = taggingService.getTags(document);
assertNotNull(tags);
assertEquals(1, tags.size());
assertTrue(tags.contains(TAG_1));
assertTrue(taggingService.hasTag(document, TAG_1));
-
+
assertFalse(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_2));
taggingService.addTag(document, TAG_2);
-
+
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_2));
tags = taggingService.getTags(document);
assertNotNull(tags);
assertEquals(2, tags.size());
assertTrue(tags.contains(TAG_1));
- assertTrue(tags.contains(TAG_2));
+ assertTrue(tags.contains(TAG_2));
assertTrue(taggingService.hasTag(document, TAG_1));
assertTrue(taggingService.hasTag(document, TAG_2));
-
+
taggingService.removeTag(document, TAG_1);
tags = taggingService.getTags(document);
assertNotNull(tags);
@@ -470,7 +459,7 @@ public class TaggingServiceImplTest
assertFalse(taggingService.hasTag(document, TAG_1));
assertTrue(tags.contains(TAG_2));
assertTrue(taggingService.hasTag(document, TAG_2));
-
+
List setTags = new ArrayList(2);
setTags.add(TAG_3);
setTags.add(TAG_1);
@@ -481,7 +470,7 @@ public class TaggingServiceImplTest
assertTrue(tags.contains(TAG_1));
assertFalse(tags.contains(TAG_2));
assertTrue(tags.contains(TAG_3.toLowerCase()));
-
+
taggingService.clearTags(document);
tags = taggingService.getTags(document);
assertNotNull(tags);
@@ -493,25 +482,25 @@ public class TaggingServiceImplTest
@Test
public void test3TagScopeFindAddRemove()
- throws Exception
+ throws Exception
{
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@Override
public Void execute() throws Throwable
- {
+ {
// Get scopes for node without
TagScope tagScope = taggingService.findTagScope(subDocument);
assertNull(tagScope);
List tagScopes = taggingService.findAllTagScopes(subDocument);
assertNotNull(tagScopes);
assertEquals(0, tagScopes.size());
-
- // Add scopes
+
+ // Add scopes
// TODO should the add return the created scope ??
taggingService.addTagScope(folder);
taggingService.addTagScope(subFolder);
-
+
// Get the scopes
tagScope = taggingService.findTagScope(subDocument);
assertNotNull(tagScope);
@@ -528,7 +517,7 @@ public class TaggingServiceImplTest
tagScopes = taggingService.findAllTagScopes(folder);
assertNotNull(tagScopes);
assertEquals(1, tagScopes.size());
-
+
// Remove a scope
taggingService.removeTagScope(folder);
tagScope = taggingService.findTagScope(subDocument);
@@ -553,19 +542,19 @@ public class TaggingServiceImplTest
@Test
public void test4TagScope()
- throws Exception
+ throws Exception
{
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@Override
public Void execute() throws Throwable
- {
+ {
// TODO add some tags before the scopes are added
-
+
// Add some tag scopes
taggingService.addTagScope(folder);
taggingService.addTagScope(subFolder);
-
+
// Add some more tags after the scopes have been added
taggingService.addTag(subDocument, TAG_1); // folder+subfolder
return null;
@@ -624,17 +613,17 @@ public class TaggingServiceImplTest
// re get the tag scopes
TagScope ts1 = taggingService.findTagScope(subDocument);
TagScope ts2 = taggingService.findTagScope(folder);
-
+
// Check that the tag scopes got populated
assertEquals(
- "Wrong tags on sub folder: " + ts1.getTags(),
- 3, ts1.getTags().size()
+ "Wrong tags on sub folder: " + ts1.getTags(),
+ 3, ts1.getTags().size()
);
assertEquals(
- "Wrong tags on main folder: " + ts2.getTags(),
- 3, ts2.getTags().size()
+ "Wrong tags on main folder: " + ts2.getTags(),
+ 3, ts2.getTags().size()
);
-
+
// check the order and count of the tagscopes
assertEquals(2, ts1.getTags().get(0).getCount());
assertEquals(2, ts1.getTags().get(1).getCount());
@@ -642,15 +631,15 @@ public class TaggingServiceImplTest
assertEquals(TAG_1, ts1.getTags().get(0).getName());
assertEquals(TAG_2, ts1.getTags().get(1).getName());
assertEquals(TAG_3.toLowerCase(), ts1.getTags().get(2).getName());
-
+
assertEquals(3, ts2.getTags().get(0).getCount());
assertEquals(2, ts2.getTags().get(1).getCount());
assertEquals(1, ts2.getTags().get(2).getCount());
assertEquals(TAG_2, ts2.getTags().get(0).getName());
assertEquals(TAG_1, ts2.getTags().get(1).getName());
assertEquals(TAG_3.toLowerCase(), ts2.getTags().get(2).getName());
-
-
+
+
// Take some off again
taggingService.removeTag(folder, TAG_2);
return null;
@@ -733,7 +722,7 @@ public class TaggingServiceImplTest
// return null;
// }
// });
-}
+ }
@Test
@SuppressWarnings("unchecked")
@@ -805,34 +794,34 @@ public class TaggingServiceImplTest
@Override
public Void execute() throws Throwable
{
- TagScopePropertyMethodInterceptor.setEnabled(Boolean.TRUE);
-
- Serializable summaryObj = nodeService.getProperty(folder, ContentModel.PROP_TAGSCOPE_SUMMARY);
- assertTrue("TagScopeSummary value on main folder is not of correct class: " + summaryObj.getClass().getName(),
- List.class.isAssignableFrom(summaryObj.getClass()));
- assertEquals(3, ((List)summaryObj).size());
-
- //Check that the next call for the same summary comes from the cache
- Serializable summaryObj2 = nodeService.getProperty(folder, ContentModel.PROP_TAGSCOPE_SUMMARY);
- assertTrue("TagScopeSummary value on main folder did not come from the cache",
- summaryObj == summaryObj2);
-
- Map props = nodeService.getProperties(subFolder);
- assertTrue("Properties of subfolder do not include tagScopeSummary", props.containsKey(ContentModel.PROP_TAGSCOPE_SUMMARY));
- summaryObj = props.get(ContentModel.PROP_TAGSCOPE_SUMMARY);
- assertTrue("TagScopeSummary value on subfolder is not of correct class: " + summaryObj.getClass().getName(),
- List.class.isAssignableFrom(summaryObj.getClass()));
- assertEquals(3, ((List)summaryObj).size());
-
- TagScopePropertyMethodInterceptor.setEnabled(Boolean.FALSE);
-
- summaryObj = nodeService.getProperty(folder, ContentModel.PROP_TAGSCOPE_SUMMARY);
- assertNull("TagScopeSummary value on main folder should be null: " + summaryObj,
- summaryObj);
-
- props = nodeService.getProperties(subFolder);
- assertFalse("Properties of subfolder should not contain tagScopeProperty", props.containsKey(ContentModel.PROP_TAGSCOPE_SUMMARY));
- return null;
+ TagScopePropertyMethodInterceptor.setEnabled(Boolean.TRUE);
+
+ Serializable summaryObj = nodeService.getProperty(folder, ContentModel.PROP_TAGSCOPE_SUMMARY);
+ assertTrue("TagScopeSummary value on main folder is not of correct class: " + summaryObj.getClass().getName(),
+ List.class.isAssignableFrom(summaryObj.getClass()));
+ assertEquals(3, ((List)summaryObj).size());
+
+ //Check that the next call for the same summary comes from the cache
+ Serializable summaryObj2 = nodeService.getProperty(folder, ContentModel.PROP_TAGSCOPE_SUMMARY);
+ assertTrue("TagScopeSummary value on main folder did not come from the cache",
+ summaryObj == summaryObj2);
+
+ Map props = nodeService.getProperties(subFolder);
+ assertTrue("Properties of subfolder do not include tagScopeSummary", props.containsKey(ContentModel.PROP_TAGSCOPE_SUMMARY));
+ summaryObj = props.get(ContentModel.PROP_TAGSCOPE_SUMMARY);
+ assertTrue("TagScopeSummary value on subfolder is not of correct class: " + summaryObj.getClass().getName(),
+ List.class.isAssignableFrom(summaryObj.getClass()));
+ assertEquals(3, ((List)summaryObj).size());
+
+ TagScopePropertyMethodInterceptor.setEnabled(Boolean.FALSE);
+
+ summaryObj = nodeService.getProperty(folder, ContentModel.PROP_TAGSCOPE_SUMMARY);
+ assertNull("TagScopeSummary value on main folder should be null: " + summaryObj,
+ summaryObj);
+
+ props = nodeService.getProperties(subFolder);
+ assertFalse("Properties of subfolder should not contain tagScopeProperty", props.containsKey(ContentModel.PROP_TAGSCOPE_SUMMARY));
+ return null;
}
});
}
@@ -840,7 +829,7 @@ public class TaggingServiceImplTest
@Test
@Category({RedundantTests.class,LuceneTests.class})
public void test6TagScopeRefresh()
- throws Exception
+ throws Exception
{
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback()
{
@@ -896,7 +885,7 @@ public class TaggingServiceImplTest
@Test
public void test7TagScopeSetUpdate()
- throws Exception
+ throws Exception
{
asyncOccurs.awaitExecution(new RetryingTransactionCallback()
{
@@ -992,7 +981,7 @@ public class TaggingServiceImplTest
This part of the code was commented out as part of the REPO-2028 to remove the lucene dependency from tests
@Category({RedundantTests.class,LuceneTests.class})
*/
-
+
// this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback()
// {
// @Override
@@ -1008,9 +997,9 @@ public class TaggingServiceImplTest
// }
// });
}
-
- /*
- * https://issues.alfresco.com/jira/browse/ETHREEOH-220
+
+ /*
+ * https://issues.alfresco.com/jira/browse/ETHREEOH-220
*/
@Test
@Category({RedundantTests.class,LuceneTests.class})
@@ -1028,7 +1017,7 @@ public class TaggingServiceImplTest
return null;
}
});
-
+
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback()
{
@Override
@@ -1052,7 +1041,7 @@ public class TaggingServiceImplTest
}
});
}
-
+
/**
* Ensures that the tag scope is correctly updated
* when folders and content are created, updated,
@@ -1076,7 +1065,7 @@ public class TaggingServiceImplTest
public NodeRef checkedOutDoc;
}
final TestData testData = new TestData();
-
+
asyncOccurs.awaitExecution(new RetryingTransactionCallback()
{
@Override
@@ -1087,32 +1076,32 @@ public class TaggingServiceImplTest
testData.tagFoo2 = taggingService.createTag(folder.getStoreRef(), "Foo2");
testData.tagFoo3 = taggingService.createTag(folder.getStoreRef(), "Foo3");
testData.tagBar = taggingService.createTag(folder.getStoreRef(), "Bar");
-
+
List tagsList = new ArrayList();
-
-
+
+
// Create two containers marked as tag scopes
Map container1Props = new HashMap(1);
container1Props.put(ContentModel.PROP_NAME, "Container1");
testData.container1 = nodeService.createNode(
- folder,
- ContentModel.ASSOC_CONTAINS,
+ folder,
+ ContentModel.ASSOC_CONTAINS,
ContentModel.ASSOC_CHILDREN,
ContentModel.TYPE_FOLDER,
container1Props).getChildRef();
assertEquals(0, nodeService.getChildAssocs(testData.container1).size());
-
+
Map container2Props = new HashMap(1);
container1Props.put(ContentModel.PROP_NAME, "Container2");
testData.container2 = nodeService.createNode(
- folder,
- ContentModel.ASSOC_CONTAINS,
+ folder,
+ ContentModel.ASSOC_CONTAINS,
ContentModel.ASSOC_CHILDREN,
ContentModel.TYPE_FOLDER,
container2Props).getChildRef();
assertEquals(0, nodeService.getChildAssocs(testData.container2).size());
-
-
+
+
// Check that the tag scopes are empty
taggingService.addTagScope(testData.container1);
taggingService.addTagScope(testData.container2);
@@ -1165,29 +1154,29 @@ public class TaggingServiceImplTest
public Void execute() throws Throwable
{
assertEquals(
- "Unexpected tags " + taggingService.findTagScope(testData.container1).getTags(),
- 2, taggingService.findTagScope(testData.container1).getTags().size()
+ "Unexpected tags " + taggingService.findTagScope(testData.container1).getTags(),
+ 2, taggingService.findTagScope(testData.container1).getTags().size()
);
assertEquals(
- "Unexpected tags " + taggingService.findTagScope(testData.container2).getTags(),
- 0, taggingService.findTagScope(testData.container2).getTags().size()
+ "Unexpected tags " + taggingService.findTagScope(testData.container2).getTags(),
+ 0, taggingService.findTagScope(testData.container2).getTags().size()
);
-
+
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
-
+
+
// Create a document within it, check that tag scope tags are updated
List tagsList = new ArrayList();
tagsList.add(testData.tagFoo1);
tagsList.add(testData.tagFoo2);
-
+
Map taggedDocProps = new HashMap(1);
taggedDocProps.put(ContentModel.PROP_NAME, "Document");
taggedDocProps.put(ContentModel.ASPECT_TAGGABLE, (Serializable)tagsList);
testData.taggedDoc = nodeService.createNode(
- testData.taggedFolder,
- ContentModel.ASSOC_CONTAINS,
+ testData.taggedFolder,
+ ContentModel.ASSOC_CONTAINS,
ContentModel.ASPECT_TAGGABLE,
ContentModel.TYPE_CONTENT,
taggedDocProps).getChildRef();
@@ -1201,18 +1190,18 @@ public class TaggingServiceImplTest
{
assertEquals(3, taggingService.findTagScope(testData.container1).getTags().size());
assertEquals(0, taggingService.findTagScope(testData.container2).getTags().size());
-
+
assertEquals(2, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
-
+
+
// Check that the Document really is a child of the folder,
// otherwise later checks will fail for really odd reasons
assertEquals(1, nodeService.getChildAssocs(testData.container1).size());
assertEquals(1, nodeService.getChildAssocs(testData.taggedFolder).size());
-
-
+
+
// Check out the node
// Tags should be doubled up. (We don't care about ContentModel.ASPECT_WORKING_COPY
// because it isn't applied at suitable times to take not of)
@@ -1227,15 +1216,15 @@ public class TaggingServiceImplTest
{
assertEquals(3, taggingService.findTagScope(testData.container1).getTags().size());
assertEquals(0, taggingService.findTagScope(testData.container2).getTags().size());
-
+
assertEquals(2, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(1, nodeService.getChildAssocs(testData.container1).size());
assertEquals(2, nodeService.getChildAssocs(testData.taggedFolder).size());
-
-
+
+
// And check it back in again
// Tags should go back to how they were
checkOutCheckInService.checkin(testData.checkedOutDoc, null);
@@ -1249,25 +1238,25 @@ public class TaggingServiceImplTest
{
assertEquals(3, taggingService.findTagScope(testData.container1).getTags().size());
assertEquals(0, taggingService.findTagScope(testData.container2).getTags().size());
-
+
assertEquals(2, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(1, nodeService.getChildAssocs(testData.container1).size());
assertEquals(1, nodeService.getChildAssocs(testData.taggedFolder).size());
-
-
+
+
// Do a node->node copy of the document onto the other container
Map taggedDocProps = new HashMap(1);
taggedDocProps.put(ContentModel.PROP_NAME, "CopyDoc");
assertEquals(0, nodeService.getChildAssocs(testData.container2).size());
testData.taggedDoc2 = nodeService.createNode(
- testData.container2,
- ContentModel.ASSOC_CONTAINS,
- ContentModel.ASPECT_TAGGABLE,
- ContentModel.TYPE_CONTENT,
- taggedDocProps).getChildRef();
+ testData.container2,
+ ContentModel.ASSOC_CONTAINS,
+ ContentModel.ASPECT_TAGGABLE,
+ ContentModel.TYPE_CONTENT,
+ taggedDocProps).getChildRef();
return null;
}
});
@@ -1281,7 +1270,7 @@ public class TaggingServiceImplTest
assertEquals(1, nodeService.getChildAssocs(testData.container2).size());
return null;
}
- });
+ });
asyncOccurs.awaitExecution(new RetryingTransactionCallback()
{
@Override
@@ -1298,27 +1287,27 @@ public class TaggingServiceImplTest
{
assertEquals(3, taggingService.findTagScope(testData.container1).getTags().size());
assertEquals(2, taggingService.findTagScope(testData.container2).getTags().size());
-
+
assertEquals(2, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
-
+
// Check that things were fine after the copy
assertEquals(1, nodeService.getChildAssocs(testData.container2).size());
assertEquals(testData.container2, nodeService.getPrimaryParent(testData.taggedDoc2).getParentRef());
assertEquals(testData.container2, taggingService.findTagScope(testData.taggedDoc2).getNodeRef());
-
-
+
+
// Copy the folder to another container
// Does a proper, recursing copy
testData.taggedFolder2 = copyService.copy(
- testData.taggedFolder, testData.container2,
- ContentModel.ASSOC_CONTAINS,
- ContentModel.ASSOC_CHILDREN,
- true);
+ testData.taggedFolder, testData.container2,
+ ContentModel.ASSOC_CONTAINS,
+ ContentModel.ASSOC_CHILDREN,
+ true);
return null;
}
});
@@ -1331,16 +1320,16 @@ public class TaggingServiceImplTest
assertEquals(3, taggingService.findTagScope(testData.container2).getTags().size());
assertEquals(2, nodeService.getChildAssocs(testData.container2).size());
assertEquals(1, nodeService.getChildAssocs(testData.taggedFolder2).size());
-
+
assertEquals(2, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(3, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(2, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo3").getCount());
-
-
+
+
// Update the document on the original
List tagsList = new ArrayList();
tagsList.add(testData.tagBar);
@@ -1358,20 +1347,20 @@ public class TaggingServiceImplTest
{
assertEquals(3, taggingService.findTagScope(testData.container1).getTags().size());
assertEquals(3, taggingService.findTagScope(testData.container2).getTags().size());
-
+
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("bar").getCount());
-
+
assertEquals(3, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(2, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo3").getCount());
-
-
+
+
// Move the document to another container
- testData.taggedDoc = nodeService.moveNode(testData.taggedDoc, testData.container2,
- ContentModel.ASSOC_CONTAINS,
- ContentModel.ASPECT_TAGGABLE).getChildRef();
+ testData.taggedDoc = nodeService.moveNode(testData.taggedDoc, testData.container2,
+ ContentModel.ASSOC_CONTAINS,
+ ContentModel.ASPECT_TAGGABLE).getChildRef();
return null;
}
});
@@ -1382,26 +1371,26 @@ public class TaggingServiceImplTest
{
assertEquals(2, taggingService.findTagScope(testData.container1).getTags().size());
assertEquals(4, taggingService.findTagScope(testData.container2).getTags().size());
-
+
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(3, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(2, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo3").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("bar").getCount());
-
-
+
+
// Check the state of the tree
assertEquals(1, nodeService.getChildAssocs(testData.container1).size());
assertEquals(3, nodeService.getChildAssocs(testData.container2).size());
-
+
assertEquals(testData.container2, nodeService.getPrimaryParent(testData.taggedDoc).getParentRef());
assertEquals(testData.container2, taggingService.findTagScope(testData.taggedDoc).getNodeRef());
assertEquals(testData.container2, nodeService.getPrimaryParent(testData.taggedDoc2).getParentRef());
assertEquals(testData.container2, taggingService.findTagScope(testData.taggedDoc2).getNodeRef());
-
-
+
+
// Delete the documents and folder one at a time
nodeService.deleteNode(testData.taggedDoc); // container 2, "bar"
return null;
@@ -1416,16 +1405,16 @@ public class TaggingServiceImplTest
assertEquals(3, taggingService.findTagScope(testData.container2).getTags().size());
assertEquals(1, nodeService.getChildAssocs(testData.container1).size());
assertEquals(2, nodeService.getChildAssocs(testData.container2).size());
-
+
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(3, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(2, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo3").getCount());
assertEquals(null, taggingService.findTagScope(testData.container2).getTag("bar"));
-
-
+
+
nodeService.deleteNode(testData.taggedDoc2); // container 2, "foo1", "foo2"
return null;
}
@@ -1439,16 +1428,16 @@ public class TaggingServiceImplTest
assertEquals(3, taggingService.findTagScope(testData.container2).getTags().size());
assertEquals(1, nodeService.getChildAssocs(testData.container1).size());
assertEquals(1, nodeService.getChildAssocs(testData.container2).size());
-
+
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container1).getTag("foo3").getCount());
-
+
assertEquals(2, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo3").getCount());
assertEquals(null, taggingService.findTagScope(testData.container2).getTag("bar"));
-
-
+
+
nodeService.deleteNode(testData.taggedFolder); // container 1, "foo1", "foo3"
return null;
}
@@ -1462,12 +1451,12 @@ public class TaggingServiceImplTest
assertEquals(3, taggingService.findTagScope(testData.container2).getTags().size());
assertEquals(0, nodeService.getChildAssocs(testData.container1).size());
assertEquals(1, nodeService.getChildAssocs(testData.container2).size());
-
+
assertEquals(2, taggingService.findTagScope(testData.container2).getTag("foo1").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo2").getCount());
assertEquals(1, taggingService.findTagScope(testData.container2).getTag("foo3").getCount());
-
-
+
+
nodeService.deleteNode(testData.taggedFolder2); // container 2, has a child also
return null;
}
@@ -1482,10 +1471,10 @@ public class TaggingServiceImplTest
assertEquals(0, nodeService.getChildAssocs(testData.container1).size());
assertEquals(0, nodeService.getChildAssocs(testData.container2).size());
return null;
- }
+ }
});
}
-
+
/**
* Ensures that a user can only tag a node they can write to,
* but that the tag scope updates propagate upwards as the system
@@ -1510,76 +1499,76 @@ public class TaggingServiceImplTest
{
@Override
public Void execute() throws Throwable
- {
- // Create a user
- if(authenticationService.authenticationExists(USER_1))
- authenticationService.deleteAuthentication(USER_1);
- if(personService.personExists(USER_1))
- personService.deletePerson(USER_1);
-
- authenticationService.createAuthentication(USER_1, "PWD".toCharArray());
- PropertyMap personProperties = new PropertyMap();
- personProperties.put(ContentModel.PROP_USERNAME, USER_1);
- personProperties.put(ContentModel.PROP_AUTHORITY_DISPLAY_NAME, "title" + USER_1);
- personProperties.put(ContentModel.PROP_FIRSTNAME, "firstName");
- personProperties.put(ContentModel.PROP_LASTNAME, "lastName");
- personProperties.put(ContentModel.PROP_EMAIL, USER_1+"@example.com");
- personProperties.put(ContentModel.PROP_JOBTITLE, "jobTitle");
- personService.createPerson(personProperties);
-
-
- // Give that user permissions on the tagging category root, so
- // they're allowed to add new tags
- NodeRef tn = taggingService.createTag(folder.getStoreRef(), "Testing");
- NodeRef tr = nodeService.getPrimaryParent(tn).getParentRef();
- permissionService.setPermission(tr, USER_1, PermissionService.EDITOR, true);
- permissionService.setPermission(tr, USER_1, PermissionService.CONTRIBUTOR, true);
-
-
- // Create a folder with a tag scope on it + auditable aspect
- // User can read but not write
- authenticationComponent.setSystemUserAsCurrentUser();
- testData.auditableFolder = nodeService.createNode(
- folder, ContentModel.ASSOC_CONTAINS,
- QName.createQName("Folder"), ContentModel.TYPE_FOLDER
- ).getChildRef();
- nodeService.addAspect(testData.auditableFolder, ContentModel.ASPECT_AUDITABLE, null);
- taggingService.addTagScope(testData.auditableFolder);
- permissionService.setPermission(testData.auditableFolder, USER_1, PermissionService.CONSUMER, true);
-
- // Auditable checks
- assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
- assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIER));
-
-
- // Create a node without tags, which the user
- // can write to
- testData.taggedNode = nodeService.createNode(
- testData.auditableFolder, ContentModel.ASSOC_CONTAINS,
- QName.createQName("Tagged"), ContentModel.TYPE_CONTENT
- ).getChildRef();
- permissionService.setPermission(testData.taggedNode, USER_1, PermissionService.EDITOR, true);
-
-
- // Tag the node as the user
- authenticationComponent.setCurrentUser(USER_1);
- assertEquals(0, taggingService.getTags(testData.taggedNode).size());
-
- nodeService.setProperty(testData.taggedNode, ContentModel.PROP_TITLE, "To ensure we're allowed to write");
-
- taggingService.addTag(testData.taggedNode, TAG_1);
- taggingService.addTag(testData.taggedNode, TAG_2);
- assertEquals(2, taggingService.getTags(testData.taggedNode).size());
-
-
- // Ensure the folder tag scope got the update
- TagScope ts = taggingService.findTagScope(testData.taggedNode);
- assertEquals(testData.auditableFolder, ts.getNodeRef());
- assertEquals(0, ts.getTags().size());
-
- assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
- assertEquals("System", nodeService.getProperty(ts.getNodeRef(), ContentModel.PROP_MODIFIER));
- return null;
+ {
+ // Create a user
+ if(authenticationService.authenticationExists(USER_1))
+ authenticationService.deleteAuthentication(USER_1);
+ if(personService.personExists(USER_1))
+ personService.deletePerson(USER_1);
+
+ authenticationService.createAuthentication(USER_1, "PWD".toCharArray());
+ PropertyMap personProperties = new PropertyMap();
+ personProperties.put(ContentModel.PROP_USERNAME, USER_1);
+ personProperties.put(ContentModel.PROP_AUTHORITY_DISPLAY_NAME, "title" + USER_1);
+ personProperties.put(ContentModel.PROP_FIRSTNAME, "firstName");
+ personProperties.put(ContentModel.PROP_LASTNAME, "lastName");
+ personProperties.put(ContentModel.PROP_EMAIL, USER_1+"@example.com");
+ personProperties.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+ personService.createPerson(personProperties);
+
+
+ // Give that user permissions on the tagging category root, so
+ // they're allowed to add new tags
+ NodeRef tn = taggingService.createTag(folder.getStoreRef(), "Testing");
+ NodeRef tr = nodeService.getPrimaryParent(tn).getParentRef();
+ permissionService.setPermission(tr, USER_1, PermissionService.EDITOR, true);
+ permissionService.setPermission(tr, USER_1, PermissionService.CONTRIBUTOR, true);
+
+
+ // Create a folder with a tag scope on it + auditable aspect
+ // User can read but not write
+ authenticationComponent.setSystemUserAsCurrentUser();
+ testData.auditableFolder = nodeService.createNode(
+ folder, ContentModel.ASSOC_CONTAINS,
+ QName.createQName("Folder"), ContentModel.TYPE_FOLDER
+ ).getChildRef();
+ nodeService.addAspect(testData.auditableFolder, ContentModel.ASPECT_AUDITABLE, null);
+ taggingService.addTagScope(testData.auditableFolder);
+ permissionService.setPermission(testData.auditableFolder, USER_1, PermissionService.CONSUMER, true);
+
+ // Auditable checks
+ assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
+ assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIER));
+
+
+ // Create a node without tags, which the user
+ // can write to
+ testData.taggedNode = nodeService.createNode(
+ testData.auditableFolder, ContentModel.ASSOC_CONTAINS,
+ QName.createQName("Tagged"), ContentModel.TYPE_CONTENT
+ ).getChildRef();
+ permissionService.setPermission(testData.taggedNode, USER_1, PermissionService.EDITOR, true);
+
+
+ // Tag the node as the user
+ authenticationComponent.setCurrentUser(USER_1);
+ assertEquals(0, taggingService.getTags(testData.taggedNode).size());
+
+ nodeService.setProperty(testData.taggedNode, ContentModel.PROP_TITLE, "To ensure we're allowed to write");
+
+ taggingService.addTag(testData.taggedNode, TAG_1);
+ taggingService.addTag(testData.taggedNode, TAG_2);
+ assertEquals(2, taggingService.getTags(testData.taggedNode).size());
+
+
+ // Ensure the folder tag scope got the update
+ TagScope ts = taggingService.findTagScope(testData.taggedNode);
+ assertEquals(testData.auditableFolder, ts.getNodeRef());
+ assertEquals(0, ts.getTags().size());
+
+ assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
+ assertEquals("System", nodeService.getProperty(ts.getNodeRef(), ContentModel.PROP_MODIFIER));
+ return null;
}
});
// Due to timestamp propagation, we need to start a new transaction to get the current folder modified date
@@ -1597,26 +1586,26 @@ public class TaggingServiceImplTest
@Override
public Void execute() throws Throwable
{
- TagScope ts = taggingService.findTagScope(testData.taggedNode);
- assertEquals(testData.auditableFolder, ts.getNodeRef());
- assertEquals(2, ts.getTags().size());
- assertEquals(1, ts.getTag(TAG_1).getCount());
- assertEquals(1, ts.getTag(TAG_2).getCount());
-
- // Ensure the auditable flags on the folder are unchanged
- assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
- assertEquals("System", nodeService.getProperty(ts.getNodeRef(), ContentModel.PROP_MODIFIER));
- assertEquals(testData.origModified.getTime(), ((Date)nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIED)).getTime());
-
- // Tidy up
- authenticationComponent.setSystemUserAsCurrentUser();
- authenticationService.deleteAuthentication(USER_1);
- personService.deletePerson(USER_1);
- return null;
+ TagScope ts = taggingService.findTagScope(testData.taggedNode);
+ assertEquals(testData.auditableFolder, ts.getNodeRef());
+ assertEquals(2, ts.getTags().size());
+ assertEquals(1, ts.getTag(TAG_1).getCount());
+ assertEquals(1, ts.getTag(TAG_2).getCount());
+
+ // Ensure the auditable flags on the folder are unchanged
+ assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
+ assertEquals("System", nodeService.getProperty(ts.getNodeRef(), ContentModel.PROP_MODIFIER));
+ assertEquals(testData.origModified.getTime(), ((Date)nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIED)).getTime());
+
+ // Tidy up
+ authenticationComponent.setSystemUserAsCurrentUser();
+ authenticationService.deleteAuthentication(USER_1);
+ personService.deletePerson(USER_1);
+ return null;
}
});
}
-
+
// == Test the JavaScript API ==
@Test
@Category({RedundantTests.class,LuceneTests.class})
@@ -1627,18 +1616,18 @@ public class TaggingServiceImplTest
@Override
public Void execute() throws Throwable
{
- Map model = new HashMap(0);
- model.put("folder", folder);
- model.put("subFolder", subFolder);
- model.put("document", document);
- model.put("subDocument", subDocument);
- model.put("tagScopeTest", false);
-
- ScriptLocation location = new ClasspathScriptLocation("org/alfresco/repo/tagging/script/test_taggingService.js");
- scriptService.executeScript(location, model);
-
- // Let the script run
- return null;
+ Map model = new HashMap(0);
+ model.put("folder", folder);
+ model.put("subFolder", subFolder);
+ model.put("document", document);
+ model.put("subDocument", subDocument);
+ model.put("tagScopeTest", false);
+
+ ScriptLocation location = new ClasspathScriptLocation("org/alfresco/repo/tagging/script/test_taggingService.js");
+ scriptService.executeScript(location, model);
+
+ // Let the script run
+ return null;
}
});
}
@@ -1646,7 +1635,7 @@ public class TaggingServiceImplTest
@Test
@Category({RedundantTests.class,LuceneTests.class})
public void test93JSTagScope() throws Exception
- {
+ {
asyncOccurs.awaitExecution(new RetryingTransactionCallback()
{
@Override
@@ -1752,7 +1741,7 @@ public class TaggingServiceImplTest
}
});
}
-
+
/**
* Test that the scheduled task will do the right thing
* when it runs.
@@ -1760,9 +1749,9 @@ public class TaggingServiceImplTest
@Test
public void test93OnStartupJob() throws Exception
{
- final UpdateTagScopesActionExecuter updateTagsAction = (UpdateTagScopesActionExecuter) ctx
+ final UpdateTagScopesActionExecuter updateTagsAction = (UpdateTagScopesActionExecuter) applicationContext
.getBean("update-tagscope");
- class TestData
+ class TestData
{
public String lockF;
public String lockSF;
@@ -1775,16 +1764,16 @@ public class TaggingServiceImplTest
{
// Nothing is pending to start with
assertEquals(0, updateTagsAction.searchForTagScopesPendingUpdates().size());
-
-
+
+
// Take the tag scope lock, so that no real updates will happen
testData.lockF = updateTagsAction.lockTagScope(folder);
testData.lockSF = updateTagsAction.lockTagScope(subFolder);
-
+
// Do some tagging
taggingService.addTagScope(folder);
taggingService.addTagScope(subFolder);
-
+
taggingService.addTag(subDocument, TAG_1);
taggingService.addTag(subDocument, TAG_2);
taggingService.addTag(subFolder, TAG_1);
@@ -1793,8 +1782,8 @@ public class TaggingServiceImplTest
taggingService.addTag(folder, TAG_3);
return null;
}
- });
-
+ });
+
asyncOccurs.awaitExecution(new RetryingTransactionCallback()
{
@Override
@@ -1805,28 +1794,28 @@ public class TaggingServiceImplTest
TagScope ts1 = taggingService.findTagScope(folder);
TagScope ts2 = taggingService.findTagScope(subFolder);
assertEquals(
- "Wrong tags on folder tagscope: " + ts1.getTags(),
- 0, ts1.getTags().size()
+ "Wrong tags on folder tagscope: " + ts1.getTags(),
+ 0, ts1.getTags().size()
);
assertEquals(
- "Wrong tags on folder tagscope: " + ts1.getTags(),
- 0, ts2.getTags().size()
+ "Wrong tags on folder tagscope: " + ts1.getTags(),
+ 0, ts2.getTags().size()
);
-
-
+
+
// Check the pending list now
assertEquals(2, updateTagsAction.searchForTagScopesPendingUpdates().size());
List pendingScopes = updateTagsAction.searchForTagScopesPendingUpdates();
assertTrue("Not found in " + pendingScopes, pendingScopes.contains(folder));
assertTrue("Not found in " + pendingScopes, pendingScopes.contains(subFolder));
-
-
+
+
// Ensure that we've still got the lock, eg in case
// of the async execution taking a while to proceed
updateTagsAction.updateTagScopeLock(folder, testData.lockF);
updateTagsAction.updateTagScopeLock(subFolder, testData.lockSF);
-
-
+
+
// Have the Quartz bean fire now
// It won't be able to do anything, as the locks are taken
UpdateTagScopesQuartzJob job = new UpdateTagScopesQuartzJob();
@@ -1847,13 +1836,13 @@ public class TaggingServiceImplTest
return null;
}
});
-
-
+
+
// Give back our locks, so we can proceed
updateTagsAction.unlockTagScope(folder, testData.lockF);
updateTagsAction.unlockTagScope(subFolder, testData.lockSF);
-
-
+
+
// Fire off the quartz bean, this time it can really work
UpdateTagScopesQuartzJob job = new UpdateTagScopesQuartzJob();
job.execute(actionService, updateTagsAction);
@@ -1865,29 +1854,29 @@ public class TaggingServiceImplTest
{
// Now check again - nothing should be pending
assertEquals(0, updateTagsAction.searchForTagScopesPendingUpdates().size());
-
+
TagScope ts1 = taggingService.findTagScope(folder);
TagScope ts2 = taggingService.findTagScope(subFolder);
assertEquals(
- "Wrong tags on folder tagscope: " + ts1.getTags(),
- 3, ts1.getTags().size()
+ "Wrong tags on folder tagscope: " + ts1.getTags(),
+ 3, ts1.getTags().size()
);
assertEquals(
- "Wrong tags on folder tagscope: " + ts1.getTags(),
- 2, ts2.getTags().size()
+ "Wrong tags on folder tagscope: " + ts1.getTags(),
+ 2, ts2.getTags().size()
);
-
+
assertEquals(4, ts1.getTag(TAG_1).getCount());
assertEquals(1, ts1.getTag(TAG_2).getCount());
assertEquals(1, ts1.getTag(TAG_3.toLowerCase()).getCount());
-
+
assertEquals(2, ts2.getTag(TAG_1).getCount());
assertEquals(1, ts2.getTag(TAG_2).getCount());
return null;
}
});
}
-
+
/**
* Test that when multiple threads do tag updates, the right thing still
* happens
@@ -1905,7 +1894,7 @@ public class TaggingServiceImplTest
return null;
}
});
-
+
// Reset the action count
asyncOccurs.wantedActionsCount = 0;
@@ -1935,7 +1924,7 @@ public class TaggingServiceImplTest
logger.debug(Thread.currentThread() + " - About to start tagging for " + tag);
// Do the updates
- AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+ AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
RetryingTransactionCallback txnCallback = new RetryingTransactionCallback()
{
@Override
@@ -1957,11 +1946,11 @@ public class TaggingServiceImplTest
logger.error("Tagging failed: " + e);
}
logger.debug(Thread.currentThread() + " - Done tagging for " + tag);
-
+
// Wait briefly for thing to catch up, before we
// declare ourselves to be done
try {
- Thread.sleep(150);
+ Thread.sleep(150);
} catch (InterruptedException e) {}
}
});
@@ -1975,7 +1964,7 @@ public class TaggingServiceImplTest
{
t.interrupt();
}
-
+
// Wait for the threads to finish (and they will finish)
// The threads will generate further asynchronous actions
for (Thread t : threads)
@@ -1983,11 +1972,11 @@ public class TaggingServiceImplTest
t.join();
}
logger.info("All threads should have finished");
-
+
// Have a brief pause, while we wait for their related
// async actions to kick off
Thread.sleep(150);
-
+
// Wait until we've had 20 async tagging actions run (One per Thread)
// Not all of the actions will do something, but we just need to
// wait for all of them!
@@ -1995,159 +1984,159 @@ public class TaggingServiceImplTest
// shows none of them running either
for (int i = 0; i < 600; i++)
{
- try
- {
- if(asyncOccurs.wantedActionsCount < tags.length)
- {
- if(i%50 == 0)
- {
- logger.info("Done " + asyncOccurs.wantedActionsCount + " of " + tags.length);
- }
- Thread.sleep(100);
- continue;
- }
- if (actionTrackingService.getAllExecutingActions().size() > 0)
- {
- if(i%50 == 0)
- {
- List actions = actionTrackingService.getAllExecutingActions();
- logger.info("Waiting on " + actions.size() + " actions: " + actions);
- }
- Thread.sleep(100);
- continue;
- }
- break;
- }
- catch (InterruptedException e)
- {
- }
+ try
+ {
+ if(asyncOccurs.wantedActionsCount < tags.length)
+ {
+ if(i%50 == 0)
+ {
+ logger.info("Done " + asyncOccurs.wantedActionsCount + " of " + tags.length);
+ }
+ Thread.sleep(100);
+ continue;
+ }
+ if (actionTrackingService.getAllExecutingActions().size() > 0)
+ {
+ if(i%50 == 0)
+ {
+ List actions = actionTrackingService.getAllExecutingActions();
+ logger.info("Waiting on " + actions.size() + " actions: " + actions);
+ }
+ Thread.sleep(100);
+ continue;
+ }
+ break;
+ }
+ catch (InterruptedException e)
+ {
+ }
}
-
+
// Extra sleep just to be sure things are quiet before we continue
// (Allows anything that runs after the async actions commit to
// finish up for example)
Thread.sleep(175);
System.out.println("Done waiting for tagging, now checking");
-
+
// Now check that things ended up as planned
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback()
{
@Override
public Void execute() throws Throwable
{
- TagScope ts1 = taggingService.findTagScope(folder);
- TagScope ts2 = taggingService.findTagScope(subFolder);
- assertEquals(
- "Wrong tags on folder tagscope: " + ts1.getTags(),
- tags.length, ts1.getTags().size()
- );
- assertEquals(
- "Wrong tags on subfolder tagscope: " + ts2.getTags(),
- tags.length, ts2.getTags().size()
- );
-
- // Each tag should crop up 3 times on the folder
- // and twice for the subfolder
- for (String tag : tags)
- {
- assertEquals(3, ts1.getTag(tag.toLowerCase()).getCount());
- assertEquals(2, ts2.getTag(tag.toLowerCase()).getCount());
- }
-
- // All done
- return null;
+ TagScope ts1 = taggingService.findTagScope(folder);
+ TagScope ts2 = taggingService.findTagScope(subFolder);
+ assertEquals(
+ "Wrong tags on folder tagscope: " + ts1.getTags(),
+ tags.length, ts1.getTags().size()
+ );
+ assertEquals(
+ "Wrong tags on subfolder tagscope: " + ts2.getTags(),
+ tags.length, ts2.getTags().size()
+ );
+
+ // Each tag should crop up 3 times on the folder
+ // and twice for the subfolder
+ for (String tag : tags)
+ {
+ assertEquals(3, ts1.getTag(tag.toLowerCase()).getCount());
+ assertEquals(2, ts2.getTag(tag.toLowerCase()).getCount());
+ }
+
+ // All done
+ return null;
}
});
}
-
-
+
+
public class AsyncOccurs implements OnAsyncActionExecute {
- private Object waitForExecutionLock = new Object();
- private static final long waitTime = 3500;
- private static final String ACTION_TYPE = UpdateTagScopesActionExecuter.NAME;
-
- private int wantedActionsCount = 0;
-
- @Override
- public void onAsyncActionExecute(Action action, NodeRef actionedUponNodeRef)
- {
- if(action.getActionDefinitionName().equals(ACTION_TYPE))
- {
- wantedActionsCount++;
- synchronized (waitForExecutionLock) {
- try {
- waitForExecutionLock.notify();
- } catch(IllegalMonitorStateException e) {}
- }
- }
- else
- {
- System.out.println("Ignoring unexpected async action:" + action);
- }
- }
-
- public T awaitExecution(RetryingTransactionCallback callback) throws Exception
- {
- T returnVal = transactionService.getRetryingTransactionHelper().doInTransaction(callback);
-
- synchronized (waitForExecutionLock) {
-
- // Always wait 100ms
- waitForExecutionLock.wait(100);
-
- // If there are actions if the required type
- // currently running, keep waiting longer for
- // them to finish
- if(actionTrackingService.getExecutingActions(ACTION_TYPE).size() > 0)
+ private Object waitForExecutionLock = new Object();
+ private static final long waitTime = 3500;
+ private static final String ACTION_TYPE = UpdateTagScopesActionExecuter.NAME;
+
+ private int wantedActionsCount = 0;
+
+ @Override
+ public void onAsyncActionExecute(Action action, NodeRef actionedUponNodeRef)
+ {
+ if(action.getActionDefinitionName().equals(ACTION_TYPE))
{
- long now = System.currentTimeMillis();
- waitForExecutionLock.wait(waitTime);
-
- if(System.currentTimeMillis() - now >= waitTime)
- {
- System.err.println("Warning - trigger wasn't received");
- }
+ wantedActionsCount++;
+ synchronized (waitForExecutionLock) {
+ try {
+ waitForExecutionLock.notify();
+ } catch(IllegalMonitorStateException e) {}
+ }
}
- }
-
- // If there are any more actions of the same type,
- // then wait for them to finish too
- for(int i=0; i<100; i++)
- {
- if( actionTrackingService.getExecutingActions(ACTION_TYPE).size() == 0 )
- {
- break;
- }
- try {
- Thread.sleep(100);
- } catch(InterruptedException e) {}
- }
- if (actionTrackingService.getExecutingActions(ACTION_TYPE).size() > 0)
- {
- System.err.println("Warning - not all actions finished");
- }
-
- return returnVal;
- }
+ else
+ {
+ System.out.println("Ignoring unexpected async action:" + action);
+ }
+ }
+
+ public T awaitExecution(RetryingTransactionCallback callback) throws Exception
+ {
+ T returnVal = transactionService.getRetryingTransactionHelper().doInTransaction(callback);
+
+ synchronized (waitForExecutionLock) {
+
+ // Always wait 100ms
+ waitForExecutionLock.wait(100);
+
+ // If there are actions if the required type
+ // currently running, keep waiting longer for
+ // them to finish
+ if(actionTrackingService.getExecutingActions(ACTION_TYPE).size() > 0)
+ {
+ long now = System.currentTimeMillis();
+ waitForExecutionLock.wait(waitTime);
+
+ if(System.currentTimeMillis() - now >= waitTime)
+ {
+ System.err.println("Warning - trigger wasn't received");
+ }
+ }
+ }
+
+ // If there are any more actions of the same type,
+ // then wait for them to finish too
+ for(int i=0; i<100; i++)
+ {
+ if( actionTrackingService.getExecutingActions(ACTION_TYPE).size() == 0 )
+ {
+ break;
+ }
+ try {
+ Thread.sleep(100);
+ } catch(InterruptedException e) {}
+ }
+ if (actionTrackingService.getExecutingActions(ACTION_TYPE).size() > 0)
+ {
+ System.err.println("Warning - not all actions finished");
+ }
+
+ return returnVal;
+ }
}
-
+
/**
* Test for https://https://issues.alfresco.com/jira/browse/ALF-17260.
- *
+ *
* When the audit queue for the tagging service contains more than 100 entries which aren't update,
* {@link UpdateTagScopesActionExecuter} was failing to update the tag scope of containers correctly.
- *
+ *
* @throws Exception
*/
@Test
- public void testALF_17260() throws Exception
+ public void testALF_17260() throws Exception
{
// Add tag scope to our container
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@Override
public Void execute() throws Throwable
- {
+ {
// Add some tag scopes
taggingService.addTagScope(folder);
return null;
@@ -2187,15 +2176,15 @@ public class TaggingServiceImplTest
return folder2;
}
};
-
+
NodeRef folder2 = transactionService.getRetryingTransactionHelper().doInTransaction(createFoldersAndTags);
nodeService.deleteNode(folder2);
}
-
- return null;
+
+ return null;
}
});
-
+
// The tag scope of our container should be empty at this stage.
asyncOccurs.awaitExecution(new RetryingTransactionCallback()
{
@@ -2204,7 +2193,7 @@ public class TaggingServiceImplTest
{
// re get the tag scopes
TagScope ts1 = taggingService.findTagScope(folder);
-
+
// Check that the tag scopes got populated
assertEquals("Wrong tags on sub folder: " + ts1.getTags(), 0, ts1.getTags().size());
return null;
@@ -2231,7 +2220,7 @@ public class TaggingServiceImplTest
{
// re get the tag scopes
TagScope ts1 = taggingService.findTagScope(folder);
-
+
// Check that the tag scopes got populated
assertEquals("Wrong tags on folder: " + ts1.getTags(), 1, ts1.getTags().size());
assertEquals("Wrong tag name", TAG_1, ts1.getTags().get(0).getName());
@@ -2289,8 +2278,8 @@ public class TaggingServiceImplTest
{
try
{
- taggingService.changeTag(storeRef, null, null);
- fail("Should throw exception");
+ taggingService.changeTag(storeRef, null, null);
+ fail("Should throw exception");
}
catch (TaggingException tae)
{
@@ -2341,7 +2330,7 @@ public class TaggingServiceImplTest
}
}
-
+
/* Test adding tags containing \n and | chars. Test all ways to create tag (e.g. createTag, addTag, setTags) */
@Test
public void testBadTags()
@@ -2349,7 +2338,7 @@ public class TaggingServiceImplTest
testTag(BAD_TAG);
testTag(BAD_TAG2);
}
-
+
private void testTag(final String tag)
{
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@@ -2365,7 +2354,7 @@ public class TaggingServiceImplTest
{
//
}
-
+
try
{
taggingService.addTag(document, tag);
@@ -2375,38 +2364,38 @@ public class TaggingServiceImplTest
{
//
}
-
+
try
{
List setTags = new ArrayList(2);
setTags.add(tag);
taggingService.setTags(document, setTags);
-
+
fail();
}
catch(IllegalArgumentException iae)
{
//
}
-
+
return null;
}
- });
+ });
}
-
+
/**
- * Tests that when the deleteTag() method runs, it will remove invalid references to the deleted tag.
+ * Tests that when the deleteTag() method runs, it will remove invalid references to the deleted tag.
*/
@Test
@Category({RedundantTests.class,LuceneTests.class})
public void testDeleteTag() throws Exception{
-
+
try{
// We instruct the 'nodeRefPropInterceptor' to skip processing on the 'get' methods.
// This is needed because this interceptor removes any properties which are invalid. e.g. have been deleted.
- // We need to make sure that the 'taggable' property stays put.
+ // We need to make sure that the 'taggable' property stays put.
nodeRefPropInterceptor.setFilterOnGet(false);
-
+
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback(){
@SuppressWarnings("unchecked")
@@ -2417,17 +2406,17 @@ public class TaggingServiceImplTest
// addTag uses lucene to get a reference to the existing TAG_1 tag node.
// this fails without lucene
taggingService.addTag(folder, TAG_1);
-
+
// The deleteTag() should remove any reference to the deleted tag
List taggableProperty = (List) nodeService.getProperty(folder, ContentModel.PROP_TAGS);
assertTrue("Our folder should have a reference on one tag.", taggableProperty.size() == 1);
-
+
taggingService.deleteTag(TaggingServiceImplTest.storeRef, TAG_1);
-
+
// The deleteTag() should remove any reference to the deleted tag
taggableProperty = (List) nodeService.getProperty(folder, ContentModel.PROP_TAGS);
assertTrue("Our folder shouldn't have any references left to deleted tags.", taggableProperty.size() == 0);
-
+
return null;
}
});
@@ -2490,7 +2479,7 @@ public class TaggingServiceImplTest
// STEP5 start job taggingStartupJobDetail
// Fire off the quartz bean, this time it can really work
- final UpdateTagScopesActionExecuter updateTagsAction = (UpdateTagScopesActionExecuter) ctx.getBean("update-tagscope");
+ final UpdateTagScopesActionExecuter updateTagsAction = (UpdateTagScopesActionExecuter) applicationContext.getBean("update-tagscope");
UpdateTagScopesQuartzJob job = new UpdateTagScopesQuartzJob();
job.execute(actionService, updateTagsAction);
@@ -2519,4 +2508,4 @@ public class TaggingServiceImplTest
return siteInfo;
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java b/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java
index 61b0729f1a..c745a7f6be 100644
--- a/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java
+++ b/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java
@@ -1,110 +1,101 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco 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 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Alfresco. If not, see ()
@@ -113,68 +104,69 @@ public class TemplateServiceImplTest extends TestCase
public Object execute() throws Exception
{
StoreRef store = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "template_" + System.currentTimeMillis());
- root_node = nodeService.getRootNode(store);
- Map properties = new HashMap(11);
- properties.put(ContentModel.PROP_NAME, (Serializable) "subFolder");
- NodeRef subFolderRef = nodeService.createNode(
- root_node,
- ContentModel.ASSOC_CHILDREN,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,QName.createValidLocalName("subFolder")),
- ContentModel.TYPE_FOLDER,
- properties).getChildRef();
- properties.put(ContentModel.PROP_NAME, (Serializable) "subSubFolder");
- NodeRef subSubFolderRef =nodeService.createNode(
- subFolderRef,
- ContentModel.ASSOC_CONTAINS,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,QName.createValidLocalName("subSubFolder")),
- ContentModel.TYPE_FOLDER,
- properties).getChildRef();
- properties.put(ContentModel.PROP_NAME, (Serializable) "subSubSubFolder");
- nodeService.createNode(
- subSubFolderRef,
- ContentModel.ASSOC_CONTAINS,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,QName.createValidLocalName("subSubSubFolder")),
- ContentModel.TYPE_FOLDER,
- properties);
+ root_node = nodeService.getRootNode(store);
+ Map properties = new HashMap(11);
+ properties.put(ContentModel.PROP_NAME, (Serializable) "subFolder");
+ NodeRef subFolderRef = nodeService.createNode(
+ root_node,
+ ContentModel.ASSOC_CHILDREN,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,QName.createValidLocalName("subFolder")),
+ ContentModel.TYPE_FOLDER,
+ properties).getChildRef();
+ properties.put(ContentModel.PROP_NAME, (Serializable) "subSubFolder");
+ NodeRef subSubFolderRef =nodeService.createNode(
+ subFolderRef,
+ ContentModel.ASSOC_CONTAINS,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,QName.createValidLocalName("subSubFolder")),
+ ContentModel.TYPE_FOLDER,
+ properties).getChildRef();
+ properties.put(ContentModel.PROP_NAME, (Serializable) "subSubSubFolder");
+ nodeService.createNode(
+ subSubFolderRef,
+ ContentModel.ASSOC_CONTAINS,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,QName.createValidLocalName("subSubSubFolder")),
+ ContentModel.TYPE_FOLDER,
+ properties);
BaseNodeServiceTest.buildNodeGraph(nodeService, root_node);
return null;
}
});
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
authenticationComponent.clearCurrentSecurityContext();
super.tearDown();
}
-
+
+ @Test
public void testTemplates()
{
transactionService.getRetryingTransactionHelper().doInTransaction(
- new RetryingTransactionCallback()
- {
- @SuppressWarnings("unchecked")
- public Object execute() throws Exception
+ new RetryingTransactionCallback()
{
+ @SuppressWarnings("unchecked")
+ public Object execute() throws Exception
+ {
- // check the default template engine exists
- assertNotNull(templateService.getTemplateProcessor("freemarker"));
- Map model = createTemplateModel(root_node);
+ // check the default template engine exists
+ assertNotNull(templateService.getTemplateProcessor("freemarker"));
+ Map model = createTemplateModel(root_node);
- // execute on test template
- String output = templateService.processTemplate("freemarker", TEMPLATE_1, model);
-
- // check template contains the expected output
- assertTrue("Cannot find root-node-id", (output.indexOf(root_node.getId()) != -1) );
- assertTrue("Cannot resolve subFolder properly", (output.indexOf("root.childByNamePath[\"subFolder\"].name=subFolder") != -1) );
- assertTrue("Cannot resolve subSubFolder properly", (output.indexOf("root.childByNamePath[\"subFolder/subSubFolder\"].name=subSubFolder") != -1) );
- assertTrue("Cannot resolve subSubSubFolder properly", (output.indexOf("root.childByNamePath[\"subFolder/subSubFolder/subSubSubFolder\"].name=subSubSubFolder") != -1) );
- assertTrue("Cannot resolve subSubSubFolder with enhancement properly", (output.indexOf("root.childByNamePath[\"subFolder\"].childByNamePath[\"subSubFolder/subSubSubFolder\"].name=subSubSubFolder") != -1) );
+ // execute on test template
+ String output = templateService.processTemplate("freemarker", TEMPLATE_1, model);
- return null;
- }
- });
+ // check template contains the expected output
+ assertTrue("Cannot find root-node-id", (output.indexOf(root_node.getId()) != -1) );
+ assertTrue("Cannot resolve subFolder properly", (output.indexOf("root.childByNamePath[\"subFolder\"].name=subFolder") != -1) );
+ assertTrue("Cannot resolve subSubFolder properly", (output.indexOf("root.childByNamePath[\"subFolder/subSubFolder\"].name=subSubFolder") != -1) );
+ assertTrue("Cannot resolve subSubSubFolder properly", (output.indexOf("root.childByNamePath[\"subFolder/subSubFolder/subSubSubFolder\"].name=subSubSubFolder") != -1) );
+ assertTrue("Cannot resolve subSubSubFolder with enhancement properly", (output.indexOf("root.childByNamePath[\"subFolder\"].childByNamePath[\"subSubFolder/subSubSubFolder\"].name=subSubSubFolder") != -1) );
+
+ return null;
+ }
+ });
}
private Map createTemplateModel(NodeRef root)
@@ -185,11 +177,13 @@ public class TemplateServiceImplTest extends TestCase
return model;
}
+ @Test
public void testGetTemplateProcessor()
{
assertNotNull(templateService.getTemplateProcessor(null));
}
+ @Test
public void testProcessTemplate()
{
Map model = createTemplateModel(root_node);
@@ -224,5 +218,5 @@ public class TemplateServiceImplTest extends TestCase
//
}
}
-
-}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java b/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
index 47d55144f2..b2d5e5aafd 100644
--- a/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
+++ b/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
@@ -1,32 +1,30 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco 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 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Alfresco. If not, see work = new TenantRunAsWork()
- {
- @Override
- public String doWork() throws Exception
- {
- return tenantService.getCurrentUserDomain();
- }
- };
-
- String result = TenantUtil.runAsUserTenant(work, USER1, DOMAIN);
- assertEquals("The domains do not match.", DOMAIN, result);
-
- // Test a default user
- userNodeRef = createUser(USER2, TenantService.DEFAULT_DOMAIN, PASS);
- assertNotNull("The user was not created.", userNodeRef);
-
- work = new TenantRunAsWork()
- {
- @Override
- public String doWork() throws Exception
- {
- return tenantService.getCurrentUserDomain();
- }
- };
-
- result = TenantUtil.runAsUserTenant(work, USER2, TenantService.DEFAULT_DOMAIN);
- assertEquals("The domains do not match.", TenantService.DEFAULT_DOMAIN, result);
+ // Test a tenant user
+ createTenant(DOMAIN);
+ NodeRef userNodeRef = createUser(USER1, DOMAIN, PASS);
+ assertNotNull("The user was not created.", userNodeRef);
+
+ TenantRunAsWork work = new TenantRunAsWork()
+ {
+ @Override
+ public String doWork() throws Exception
+ {
+ return tenantService.getCurrentUserDomain();
+ }
+ };
+
+ String result = TenantUtil.runAsUserTenant(work, USER1, DOMAIN);
+ assertEquals("The domains do not match.", DOMAIN, result);
+
+ // Test a default user
+ userNodeRef = createUser(USER2, TenantService.DEFAULT_DOMAIN, PASS);
+ assertNotNull("The user was not created.", userNodeRef);
+
+ work = new TenantRunAsWork()
+ {
+ @Override
+ public String doWork() throws Exception
+ {
+ return tenantService.getCurrentUserDomain();
+ }
+ };
+
+ result = TenantUtil.runAsUserTenant(work, USER2, TenantService.DEFAULT_DOMAIN);
+ assertEquals("The domains do not match.", TenantService.DEFAULT_DOMAIN, result);
return null;
}
};
transactionService.getRetryingTransactionHelper().doInTransaction(work);
- assertEquals("fred", multiTServiceImpl.getMultiTenantDomainName("@fred@bloggs"));
+ assertEquals("fred", multiTServiceImpl.getMultiTenantDomainName("@fred@bloggs"));
}
-
+
@Test
public void testGetName()
{
@@ -241,120 +237,120 @@ public class MultiTServiceImplTest
public Void execute() throws Throwable
{
- NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
- assertNotNull("The user was not created.", userNodeRef);
- TenantRunAsWork work1 = new TenantRunAsWork()
- {
- @Override
- public NodeRef doWork() throws Exception
- {
- return tenantService.getName(NODE_REF);
- }
- };
- NodeRef result = TenantUtil.runAsUserTenant(work1, USER1, TenantService.DEFAULT_DOMAIN);
- assertEquals("The NodeRef should contain domain.", NODE_REF, result);
-
- createTenant(DOMAIN);
- userNodeRef = createUser(USER2, DOMAIN, PASS);
- assertNotNull("The user was not created.", userNodeRef);
- work1 = new TenantRunAsWork()
- {
- @Override
- public NodeRef doWork() throws Exception
- {
- return tenantService.getName(NODE_REF);
- }
- };
- result = TenantUtil.runAsUserTenant(work1, USER2, DOMAIN);
- assertEquals("The NodeRef should contain domain.", TENANT_NODE_REF, result);
+ NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
+ assertNotNull("The user was not created.", userNodeRef);
+ TenantRunAsWork work1 = new TenantRunAsWork()
+ {
+ @Override
+ public NodeRef doWork() throws Exception
+ {
+ return tenantService.getName(NODE_REF);
+ }
+ };
+ NodeRef result = TenantUtil.runAsUserTenant(work1, USER1, TenantService.DEFAULT_DOMAIN);
+ assertEquals("The NodeRef should contain domain.", NODE_REF, result);
- work1 = new TenantRunAsWork()
- {
- @Override
- public NodeRef doWork() throws Exception
- {
- return tenantService.getName(TENANT_NODE_REF, NODE_REF);
- }
- };
- result = TenantUtil.runAsUserTenant(work1, USER2, DOMAIN);
- assertEquals("The NodeRef should contain domain.", TENANT_NODE_REF, result);
-
- TenantRunAsWork work2 = new TenantRunAsWork()
- {
- @Override
- public StoreRef doWork() throws Exception
- {
- return tenantService.getName(STORE_REF);
- }
- };
- StoreRef result2 = TenantUtil.runAsUserTenant(work2, USER2, DOMAIN);
- assertEquals("The StoreRef should contain domain.", TENANT_STORE_REF, result2);
-
- TenantRunAsWork work3 = new TenantRunAsWork()
- {
- @Override
- public ChildAssociationRef doWork() throws Exception
- {
- return tenantService.getName(childAssocRef);
- }
- };
- ChildAssociationRef result3 = TenantUtil.runAsUserTenant(work3, USER2, DOMAIN);
- assertEquals("The ChildAssociationRef should contain domain.", tenantChildAssocRef, result3);
-
- TenantRunAsWork work4 = new TenantRunAsWork()
- {
- @Override
- public AssociationRef doWork() throws Exception
- {
- return tenantService.getName(assocRef);
- }
- };
- AssociationRef result4 = TenantUtil.runAsUserTenant(work4, USER2, DOMAIN);
- assertEquals("The AssociationRef should contain domain.", tenantAssocRef, result4);
-
- TenantRunAsWork work5 = new TenantRunAsWork()
- {
- @Override
- public StoreRef doWork() throws Exception
- {
- return tenantService.getName(USER2_WITH_DOMAIN, STORE_REF);
- }
- };
- StoreRef result5 = TenantUtil.runAsUserTenant(work5, USER2, DOMAIN);
- assertEquals("The StoreRef should contain domain.", TENANT_STORE_REF, result5);
-
- TenantRunAsWork work6 = new TenantRunAsWork()
- {
- @Override
- public QName doWork() throws Exception
- {
- return tenantService.getName(QNAME);
- }
- };
- QName result6 = TenantUtil.runAsUserTenant(work6, USER2, DOMAIN);
- assertEquals("The QName should contain domain.", TENANT_QNAME, result6);
-
- TenantRunAsWork work7 = new TenantRunAsWork