diff --git a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java index fdb185b7f4..2ff48fe41d 100644 --- a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java +++ b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java @@ -58,8 +58,6 @@ import org.alfresco.util.test.junitrules.TemporarySites; import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.SQLServerDialect; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; @@ -116,8 +114,7 @@ public class SubscriptionServiceActivitiesTest protected static FeedGenerator feedGenerator; protected static RetryingTransactionHelper transactionHelper; protected static NodeArchiveService nodeArchiveService; - protected static Dialect dialect; - + private static Scheduler QUARTZ_SCHEDULER; // Test Sites - these are all created by USER_ONE & hence USER_ONE is the SiteManager. @@ -146,7 +143,6 @@ public class SubscriptionServiceActivitiesTest contentService = (ContentService) ctx.getBean("ContentService"); nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService"); transactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper"); - dialect = (Dialect) ctx.getBean("dialect"); ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory) ctx.getBean("ActivitiesFeed"); ApplicationContext activitiesFeedCtx = activitiesFeed.getApplicationContext(); @@ -236,13 +232,6 @@ public class SubscriptionServiceActivitiesTest @Test public void testFollowingActivity() throws Exception { - // disable in case of SQL Server - // see MNT-13089 - if (dialect instanceof SQLServerDialect) - { - return; - } - // We'll change things in the system in order to cause the generation of activity events and compare the feeds with these totals as we go. // Initially, both users have zero activity feed entries. // Java's requirement for final modifiers on variables accessed within inner classes means we can't use simple ints here. diff --git a/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java b/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java index 3a3aeec831..7351d3d149 100644 --- a/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java @@ -42,8 +42,6 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.SQLServerDialect; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -67,7 +65,6 @@ public class MultiTServiceImplTest private NodeService nodeService; private SearchService searchService; private NamespaceService namespaceService; - private Dialect dialect; private UserTransaction txn; @@ -116,7 +113,6 @@ public class MultiTServiceImplTest nodeService = ctx.getBean("NodeService", NodeService.class); searchService = ctx.getBean("SearchService", SearchService.class); namespaceService = ctx.getBean("NamespaceService", NamespaceService.class); - dialect = ctx.getBean("dialect", Dialect.class); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); @@ -194,12 +190,6 @@ public class MultiTServiceImplTest @Test public void testGetName() { - // disable in case of SQL Server - // see MNT-13089 - if (dialect instanceof SQLServerDialect) - { - return; - } NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS); assertNotNull("The user was not created.", userNodeRef); TenantRunAsWork work1 = new TenantRunAsWork() @@ -596,13 +586,6 @@ public class MultiTServiceImplTest @Test public void testGetUserDomain() { - // disable in case of SQL Server - // see MNT-13089 - if (dialect instanceof SQLServerDialect) - { - return; - } - String result = tenantService.getUserDomain(USER1); assertEquals("The user domain should be the default one for a non tenant user without a tenant in name.", TenantService.DEFAULT_DOMAIN, result);