SAK-48670 change access and make abstract test classes

susowrc · May 3, 2023 · 5d85d39 · 5d85d39
1 parent 94f22db
commit 5d85d39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/kernel/kernel-test/src/main/java/org/sakaiproject/test/SakaiTestConfiguration.java b/kernel/kernel-test/src/main/java/org/sakaiproject/test/SakaiTestConfiguration.java
@@ -49,12 +49,11 @@
 import org.springframework.orm.hibernate5.HibernateTransactionManager;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBuilder;
 
-public class SakaiTestConfiguration {
+public abstract class SakaiTestConfiguration {
 
-    @Autowired
-    private Environment environment;
+    @Autowired protected Environment environment;
 
-    protected AdditionalHibernateMappings getAdditionalHibernateMappings() { return null; };
+    protected abstract AdditionalHibernateMappings getAdditionalHibernateMappings();
 
     @Bean(name = "org.sakaiproject.springframework.orm.hibernate.GlobalSessionFactory")
     public SessionFactory sessionFactory() throws IOException {

diff --git a/kernel/kernel-test/src/main/java/org/sakaiproject/test/SakaiTests.java b/kernel/kernel-test/src/main/java/org/sakaiproject/test/SakaiTests.java
@@ -38,11 +38,11 @@
 import org.junit.Before;
 
 @Slf4j
-public class SakaiTests extends AbstractTransactionalJUnit4SpringContextTests {
+public abstract class SakaiTests extends AbstractTransactionalJUnit4SpringContextTests {
 
-    @Autowired public AuthzGroupService authzGroupService;
-    @Autowired public UserDirectoryService userDirectoryService;
-    @Autowired public SiteService siteService;
+    @Autowired protected AuthzGroupService authzGroupService;
+    @Autowired protected UserDirectoryService userDirectoryService;
+    @Autowired protected SiteService siteService;
 
     public String instructor = "instructor";
     public User instructorUser = null;