Initialise always as GlobalTestScope.Pair

Author: rbygrave

inject-test/src/main/java/io/avaje/inject/test/GlobalTestScope.java

@@ -34,7 +34,7 @@ Pair obtain(ExtensionContext context) {
   }
 
   private void initialise(ExtensionContext context) {
-    globalBeanScope = TSBuild.initialise();
+    globalBeanScope = TSBuild.initialise(false);
     log.log(TRACE, "register global test BeanScope with beans {0}", globalBeanScope);
     context.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).put(InjectExtension.class.getCanonicalName(), this);
   }

inject-test/src/main/java/io/avaje/inject/test/TSBuild.java

@@ -21,7 +21,7 @@
 final class TSBuild {
 
   private static final ReentrantLock lock = new ReentrantLock();
-  private static BeanScope SCOPE;
+  private static GlobalTestScope.Pair SCOPE;
 
   private final boolean shutdownHook;
 
@@ -37,12 +37,11 @@ static BeanScope createTestBaseScope(boolean shutdownHook) {
   /**
    * Return the test BeanScope only creating once.
    */
-  @Nullable
-  static BeanScope initialise(boolean shutdownHook) {
+  static GlobalTestScope.Pair initialise(boolean shutdownHook) {
     lock.lock();
     try {
       if (SCOPE == null) {
-        SCOPE = createTestBaseScope(shutdownHook);
+        SCOPE = createScopes(shutdownHook);
       }
       return SCOPE;
     } finally {
@@ -54,8 +53,8 @@ static BeanScope initialise(boolean shutdownHook) {
     this.shutdownHook = shutdownHook;
   }
 
-  static GlobalTestScope.Pair initialise() {
-    BeanScope testBaseScope = createTestBaseScope(false);
+  private static GlobalTestScope.Pair createScopes(boolean shutdownHook) {
+    BeanScope testBaseScope = createTestBaseScope(shutdownHook);
     BeanScope testAllScope = createTestAllScope(testBaseScope);
     return new GlobalTestScope.Pair(testAllScope, testBaseScope);
   }

inject-test/src/main/java/io/avaje/inject/test/TestBeanScope.java

@@ -38,8 +38,8 @@ public abstract class TestBeanScope {
    * @return A new test BeanScope with the global "test scope" as its parent.
    */
   public static BeanScopeBuilder builder() {
-    BeanScope globalTestScope = init(true);
-    return BeanScope.builder().parent(globalTestScope, false);
+    BeanScope baseTestScope = init(true);
+    return BeanScope.builder().parent(baseTestScope, false);
   }
 
   /**
@@ -79,7 +79,7 @@ public static BeanScope create(boolean shutdownHook) {
 
   @Nullable
   static BeanScope init(boolean shutdownHook) {
-    return TSBuild.initialise(shutdownHook);
+    return TSBuild.initialise(shutdownHook).baseScope();
   }
 
 }