From 461db4a173902fffec4c1639a32e5f69e149eb00 Mon Sep 17 00:00:00 2001
From: Constantin Popa <Constantin.popa@ness.com>
Date: Tue, 14 Feb 2017 16:32:38 +0000
Subject: [PATCH] Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)    135141 cpopa: Merged
 WEBAPP-API (5.2.1) to 5.1.N (5.1.3)       135076 cpopa: MNT-17341 : External
 users with Manager role cannot invite other external users to the site
 because site invitation accept fails          - removed redundant test which
 was also causing problems to AbstractInvitationServiceImplTest because of a
 name clash            SiteService.deleteSite doesn't remove a site
 completely, instead it leaves behind authorities and permissions, thus a
 SiteService.createSite would throw an exception            even though
 SiteService.getSite returns null.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../AbstractInvitationServiceImplTest.java    |  1 +
 .../repo/site/SiteServiceImplTest.java        | 27 -------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java b/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
index 3e5a4300fd..67c36c7927 100644
--- a/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
@@ -702,6 +702,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
                 siteService.createSite("InviteSitePreset", siteName, "InviteSiteTitle",
                         "InviteSiteDescription", SiteVisibility.MODERATED);
             }
+            assertEquals( SiteModel.SITE_MANAGER, siteService.getMembersRole(siteName, AuthenticationUtil.getAdminUserName()));
 
             // Invite user
             NominatedInvitation nominatedInvitation = invitationService.inviteNominated(
diff --git a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
index b1ebd652b8..95bdf04954 100644
--- a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
@@ -851,33 +851,6 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
         startNewTransaction();
     }
     
-    public void testMNT_15614() throws Exception
-    {
-        RetryingTransactionCallback<Object> work = new RetryingTransactionCallback<Object>()
-        {
-
-            @Override
-            public Object execute() throws Throwable
-            {
-                String[] siteNames = { "it", "site", "GROUP" };
-
-                authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
-
-                for (String siteName : siteNames)
-                {
-                    siteService.createSite(siteName, siteName, siteName, siteName, SiteVisibility.PUBLIC);
-                    assertEquals( SiteModel.SITE_MANAGER, siteService.getMembersRole(siteName, AuthenticationUtil.getAdminUserName()));
-                    siteService.deleteSite(siteName);
-                }
-
-                return null;
-            }
-        };
-        endTransaction();
-        transactionService.getRetryingTransactionHelper().doInTransaction(work);
-        startNewTransaction();
-    }
-    
     /**
      * Test listSite case sensitivity
      */