From 0d4ed55675da2d2d3984638e5a4b445aba1beb27 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 25 Mar 2015 15:31:08 +0000 Subject: [PATCH] Add explicit mention that the mocked methods are generics using Objects. These five lines were causing errors for me using Eclipse configured to the Sun jdk1.8. Apparently there was no issue in IntelliJ and everything worked fine from the command line before and after. +review RM git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../job/DispositionLifecycleJobExecuterUnitTest.java | 4 ++-- .../org_alfresco_module_rm/test/util/BaseUnitTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java index 813cb9611b..fddc81c341 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java @@ -142,7 +142,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest // ensure work is executed in transaction for each node processed verify(mockedNodeService, times(2)).exists(any(NodeRef.class)); - verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class)); + verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class)); // ensure each node is process correctly verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION); @@ -213,7 +213,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest // ensure work is executed in transaction for each node processed verify(mockedNodeService, times(2)).exists(any(NodeRef.class)); - verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class)); + verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class)); // ensure each node is process correctly // node1 diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java index ab726af049..aa550b3673 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java @@ -167,7 +167,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel return callback.execute(); } }; - doAnswer(doInTransactionAnswer).when(mockedRetryingTransactionHelper).doInTransaction(any(RetryingTransactionCallback.class)); + doAnswer(doInTransactionAnswer).when(mockedRetryingTransactionHelper).doInTransaction(any(RetryingTransactionCallback.class)); // setup mocked authentication util setupAuthenticationUtilMock(); @@ -215,7 +215,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel return work.doWork(); } - }).when(mockedAuthenticationUtil).runAsSystem(any(RunAsWork.class)); + }).when(mockedAuthenticationUtil).runAsSystem(any(RunAsWork.class)); // just do the work doAnswer(new Answer() @@ -228,7 +228,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel return work.doWork(); } - }).when(mockedAuthenticationUtil).runAs(any(RunAsWork.class), anyString()); + }).when(mockedAuthenticationUtil).runAs(any(RunAsWork.class), anyString()); // assume admin doReturn("admin").when(mockedAuthenticationUtil).getAdminUserName();