From 173571c659afd5f06befb2a69533e062fe750950 Mon Sep 17 00:00:00 2001
From: Zhilu Tang <tonythompsoncmu@gmail.com>
Date: Mon, 11 Aug 2025 11:29:59 -0700
Subject: [PATCH] Revise the test code to audit the second revision based on
 e1fafcc0

---
 .../sample/src/main/java/demo/RootScope.java   |  4 ++--
 .../sample/src/main/java/demo/RootScope2.java  |  4 ++--
 .../sample/app/root/manual_1/RootScope.java    |  4 ++--
 .../app/root/manual_1/RootScopeImpl.java       |  2 +-
 .../sample/app/root/manual_2/RootScope.java    |  4 ++--
 .../app/root/manual_2/RootScopeImpl.java       | 18 +++++++-----------
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/samples/sample/src/main/java/demo/RootScope.java b/samples/sample/src/main/java/demo/RootScope.java
index 128bcd46..02fd4bef 100644
--- a/samples/sample/src/main/java/demo/RootScope.java
+++ b/samples/sample/src/main/java/demo/RootScope.java
@@ -24,9 +24,9 @@ public interface RootScope {
   @motif.Objects
   abstract class Objects {
 
-    abstract Bar bar();
+    public abstract Bar bar();
 
-    String foo(int param) {
+    public String foo(int param) {
       return String.valueOf(param);
     }
   }
diff --git a/samples/sample/src/main/java/demo/RootScope2.java b/samples/sample/src/main/java/demo/RootScope2.java
index 68fce7ad..54d98484 100644
--- a/samples/sample/src/main/java/demo/RootScope2.java
+++ b/samples/sample/src/main/java/demo/RootScope2.java
@@ -24,9 +24,9 @@ public interface RootScope2 {
   @motif.Objects
   abstract class Objects {
 
-    abstract Bar bar();
+    public abstract Bar bar();
 
-    String foo(int param) {
+    public String foo(int param) {
       return String.valueOf(param);
     }
   }
diff --git a/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScope.java b/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScope.java
index 169db4b4..310d677d 100644
--- a/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScope.java
+++ b/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScope.java
@@ -9,9 +9,9 @@ public interface RootScope {
   @motif.Objects
   abstract class Objects {
 
-    abstract Bar bar();
+   public abstract Bar bar();
 
-    String foo(int param) {
+    public String foo(int param) {
       return String.valueOf(param);
     }
   }
diff --git a/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScopeImpl.java b/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScopeImpl.java
index 9780d18e..53133169 100644
--- a/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScopeImpl.java
+++ b/samples/sample/src/test/java/motif/sample/app/root/manual_1/RootScopeImpl.java
@@ -66,7 +66,7 @@ public interface Dependencies {
   private static class Objects extends RootScope.Objects {
 
     @Override
-    Bar bar() {
+    public Bar bar() {
       throw new UnsupportedOperationException();
     }
   }
diff --git a/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScope.java b/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScope.java
index a2310c34..ad68af13 100644
--- a/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScope.java
+++ b/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScope.java
@@ -25,9 +25,9 @@ public interface RootScope {
   @motif.Objects
   abstract class Objects {
 
-    abstract Bar bar();
+    public abstract Bar bar();
 
-    String foo(int param) {
+    public String foo(int param) {
       return String.valueOf(param);
     }
   }
diff --git a/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScopeImpl.java b/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScopeImpl.java
index 0dee22f2..db6dea1c 100644
--- a/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScopeImpl.java
+++ b/samples/sample/src/test/java/motif/sample/app/root/manual_2/RootScopeImpl.java
@@ -1,7 +1,6 @@
 package motif.sample.app.root.manual_2;
 
 import demo.Bar;
-import motif.internal.Initialized;
 
 public class RootScopeImpl implements RootScope {
 
@@ -22,7 +21,7 @@ public String foo() {
     return string();
   }
 
-  RootScope rootScope2() {
+  RootScope rootScope() {
     return this;
   }
 
@@ -32,13 +31,13 @@ Bar bar() {
       synchronized (this) {
         if (bar == null) {
           _bar = new Bar();
+          if (_bar == null) {
+            throw new NullPointerException("Factory method cannot return null");
+          }
           bar = _bar;
         }
       }
     }
-    if (_bar == Initialized.INITIALIZED) {
-      return null;
-    }
     return (Bar) _bar;
   }
 
@@ -49,15 +48,12 @@ String string() {
         if (string == null) {
           _string = objects.foo(integer());
           if (_string == null) {
-            _string = Initialized.INITIALIZED;
+            throw new NullPointerException("Factory method cannot return null");
           }
           string = _string;
         }
       }
     }
-    if (_string == Initialized.INITIALIZED) {
-      return null;
-    }
     return (String) _string;
   }
 
@@ -70,7 +66,7 @@ public interface Dependencies {
     /**
      * <ul>
      * Requested from:
-     * <li>{@link demo.RootScope2.Objects#foo(int)}</li>
+     * <li>{@link demo.RootScope.Objects#foo(int)}</li>
      * </ul>
      */
     int integer();
@@ -79,7 +75,7 @@ public interface Dependencies {
   private static class Objects extends RootScope.Objects {
 
     @Override
-    Bar bar() {
+    public Bar bar() {
       throw new UnsupportedOperationException();
     }
   }