From fd77c955a9a133df87bf0b7c5b359819617e0a05 Mon Sep 17 00:00:00 2001 From: Guice Team Date: Thu, 21 Nov 2024 12:32:24 -0800 Subject: [PATCH] Breaks some downstream tests that assumed the error message was written a certain way. PiperOrigin-RevId: 698877656 --- .../internal/ChildBindingAlreadySetError.java | 6 ++--- .../com/google/inject/JitBindingsTest.java | 8 +++---- .../com/google/inject/ParentInjectorTest.java | 10 +++------ .../com/google/inject/PrivateModuleTest.java | 22 ++++++------------- ...ng_already_set_by_just_in_time_binding.txt | 2 +- .../child_binding_already_set_error.txt | 2 +- ...nding_already_set_multiple_times_error.txt | 2 +- ...tiple_child_binding_already_set_errors.txt | 2 +- 8 files changed, 19 insertions(+), 35 deletions(-) diff --git a/core/src/com/google/inject/internal/ChildBindingAlreadySetError.java b/core/src/com/google/inject/internal/ChildBindingAlreadySetError.java index 46a3271d90..b2362ac53a 100644 --- a/core/src/com/google/inject/internal/ChildBindingAlreadySetError.java +++ b/core/src/com/google/inject/internal/ChildBindingAlreadySetError.java @@ -21,10 +21,8 @@ final class ChildBindingAlreadySetError extends InternalErrorDetail clazz) { } private String inChildMessage(Class clazz) { - return "A binding for JitBindingsTest$" + return "Unable to create binding for " + + "JitBindingsTest$" + clazz.getSimpleName() - + " already exists in one or more child" - + " injectors or private modules. Bindings from children can only be used by a parent if" - + " the child was a PrivateModule and the binding was exposed. Parent injectors cannot" - + " create bindings that already exist in a child."; + + " because it was already configured on one or more child injectors or private modules"; } public void testLinkedBindingWorks() { diff --git a/core/test/com/google/inject/ParentInjectorTest.java b/core/test/com/google/inject/ParentInjectorTest.java index 8290278bb6..59ecb62573 100644 --- a/core/test/com/google/inject/ParentInjectorTest.java +++ b/core/test/com/google/inject/ParentInjectorTest.java @@ -41,9 +41,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** - * @author jessewilson@google.com (Jesse Wilson) - */ +/** @author jessewilson@google.com (Jesse Wilson) */ @RunWith(JUnit4.class) public class ParentInjectorTest { @@ -72,10 +70,8 @@ public void testParentJitBindingWontClobberChildBinding() { } catch (ConfigurationException e) { assertContains( e.getMessage(), - "A binding for ParentInjectorTest$A already exists in one or more child injectors or" - + " private modules. Bindings from children can only be used by a parent if the child" - + " was a PrivateModule and the binding was exposed. Parent injectors cannot create" - + " bindings that already exist in a child.", + "Unable to create binding for ParentInjectorTest$A because it was already configured on" + + " one or more child injectors or private modules.", "ParentInjectorTest$9.configure"); } } diff --git a/core/test/com/google/inject/PrivateModuleTest.java b/core/test/com/google/inject/PrivateModuleTest.java index d4b12818fd..fe09b983f9 100644 --- a/core/test/com/google/inject/PrivateModuleTest.java +++ b/core/test/com/google/inject/PrivateModuleTest.java @@ -32,9 +32,7 @@ import java.util.List; import junit.framework.TestCase; -/** - * @author jessewilson@google.com (Jesse Wilson) - */ +/** @author jessewilson@google.com (Jesse Wilson) */ public class PrivateModuleTest extends TestCase { public void testBasicUsage() { @@ -591,10 +589,8 @@ public void testParentBindsSomethingInPrivate() { assertEquals(1, expected.getErrorMessages().size()); assertContains( expected.toString(), - "A binding for List already exists in one or more child injectors", - " or private modules. Bindings from children can only be used by a parent if the child", - " was a PrivateModule and the binding was exposed. Parent injectors cannot create", - " bindings that already exist in a child.", + "Unable to create binding for List ", + "because it was already configured on one or more child injectors or private modules.", "1 : PrivateModuleTest$FailingPrivateModule.configure", "PrivateModuleTest$FailingModule -> PrivateModuleTest$ManyPrivateModules ->" + " PrivateModuleTest$FailingPrivateModule", @@ -614,10 +610,8 @@ public void testParentBindingToPrivateLinkedJitBinding() { assertEquals(1, expected.getErrorMessages().size()); assertContains( expected.toString(), - "A binding for List already exists in one or more child injectors", - " or private modules. Bindings from children can only be used by a parent if the child", - " was a PrivateModule and the binding was exposed. Parent injectors cannot create", - " bindings that already exist in a child.", + "Unable to create binding for List because it was already configured on one or" + + " more child injectors or private modules", "1 : PrivateModuleTest$FailingPrivateModule.configure", "PrivateModuleTest$ManyPrivateModules -> PrivateModuleTest$FailingPrivateModule", "2 : PrivateModuleTest$SecondFailingPrivateModule.configure", @@ -634,10 +628,8 @@ public void testParentBindingToPrivateJitBinding() { assertEquals(1, expected.getErrorMessages().size()); assertContains( expected.toString(), - "A binding for PrivateModuleTest$PrivateFoo already exists in one or more child", - " injectors or private modules. Bindings from children can only be used by a parent if", - " the child was a PrivateModule and the binding was exposed. Parent injectors cannot", - " create bindings that already exist in a child.", + "Unable to create binding for PrivateModuleTest$PrivateFoo because it was already" + + " configured on one or more child injectors or private modules.", "as a just-in-time binding"); } } diff --git a/core/test/com/google/inject/errors/testdata/child_binding_already_set_by_just_in_time_binding.txt b/core/test/com/google/inject/errors/testdata/child_binding_already_set_by_just_in_time_binding.txt index 93907409d9..aceeb94acc 100644 --- a/core/test/com/google/inject/errors/testdata/child_binding_already_set_by_just_in_time_binding.txt +++ b/core/test/com/google/inject/errors/testdata/child_binding_already_set_by_just_in_time_binding.txt @@ -1,6 +1,6 @@ Guice configuration errors: -1) [Guice/ChildBindingAlreadySet]: A binding for ChildBindingAlreadySetErrorTest$DependsOnFoo already exists in one or more child injectors or private modules. Bindings from children can only be used by a parent if the child was a PrivateModule and the binding was exposed. Parent injectors cannot create bindings that already exist in a child. +1) [Guice/ChildBindingAlreadySet]: Unable to create binding for ChildBindingAlreadySetErrorTest$DependsOnFoo because it was already configured on one or more child injectors or private modules. Bound at: 1 : ChildBindingAlreadySetErrorTest$ChildModule4.configure(ChildBindingAlreadySetErrorTest.java:105) diff --git a/core/test/com/google/inject/errors/testdata/child_binding_already_set_error.txt b/core/test/com/google/inject/errors/testdata/child_binding_already_set_error.txt index ed0c81a309..dad306c3f8 100644 --- a/core/test/com/google/inject/errors/testdata/child_binding_already_set_error.txt +++ b/core/test/com/google/inject/errors/testdata/child_binding_already_set_error.txt @@ -1,6 +1,6 @@ Guice configuration errors: -1) [Guice/ChildBindingAlreadySet]: A binding for ChildBindingAlreadySetErrorTest$Foo already exists in one or more child injectors or private modules. Bindings from children can only be used by a parent if the child was a PrivateModule and the binding was exposed. Parent injectors cannot create bindings that already exist in a child. +1) [Guice/ChildBindingAlreadySet]: Unable to create binding for ChildBindingAlreadySetErrorTest$Foo because it was already configured on one or more child injectors or private modules. Bound at: 1 : ChildBindingAlreadySetErrorTest$ChildModule.configure(ChildBindingAlreadySetErrorTest.java:34) diff --git a/core/test/com/google/inject/errors/testdata/child_binding_already_set_multiple_times_error.txt b/core/test/com/google/inject/errors/testdata/child_binding_already_set_multiple_times_error.txt index d0c3f8f155..f55cdff782 100644 --- a/core/test/com/google/inject/errors/testdata/child_binding_already_set_multiple_times_error.txt +++ b/core/test/com/google/inject/errors/testdata/child_binding_already_set_multiple_times_error.txt @@ -1,6 +1,6 @@ Guice configuration errors: -1) [Guice/ChildBindingAlreadySet]: A binding for ChildBindingAlreadySetErrorTest$Foo already exists in one or more child injectors or private modules. Bindings from children can only be used by a parent if the child was a PrivateModule and the binding was exposed. Parent injectors cannot create bindings that already exist in a child. +1) [Guice/ChildBindingAlreadySet]: Unable to create binding for ChildBindingAlreadySetErrorTest$Foo because it was already configured on one or more child injectors or private modules. Bound at: 1 : ChildBindingAlreadySetErrorTest$ChildModule.configure(ChildBindingAlreadySetErrorTest.java:34) diff --git a/core/test/com/google/inject/errors/testdata/multiple_child_binding_already_set_errors.txt b/core/test/com/google/inject/errors/testdata/multiple_child_binding_already_set_errors.txt index 93a5388996..e0663cd354 100644 --- a/core/test/com/google/inject/errors/testdata/multiple_child_binding_already_set_errors.txt +++ b/core/test/com/google/inject/errors/testdata/multiple_child_binding_already_set_errors.txt @@ -1,6 +1,6 @@ Unable to create injector, see the following errors: -1) [Guice/ChildBindingAlreadySet]: A binding for ChildBindingAlreadySetErrorTest$Foo already exists in one or more child injectors or private modules. Bindings from children can only be used by a parent if the child was a PrivateModule and the binding was exposed. Parent injectors cannot create bindings that already exist in a child. +1) [Guice/ChildBindingAlreadySet]: Unable to create binding for ChildBindingAlreadySetErrorTest$Foo because it was already configured on one or more child injectors or private modules. Bound at: 1 : ChildBindingAlreadySetErrorTest$ChildModule.configure(ChildBindingAlreadySetErrorTest.java:34)