aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremcmanus <emcmanus@google.com>2020-06-18 11:47:50 -0700
committerNick <565601+nick-someone@users.noreply.github.com>2020-06-22 09:32:43 -0400
commitda84ef1fae38f2d72901c2b95674271e89600f28 (patch)
tree63dff03993d2550cd3e88af43c08723a4c9af856
parentdf5641b2340c8a437ab2c1c9579b97db27bc9fac (diff)
downloadauto-da84ef1fae38f2d72901c2b95674271e89600f28.tar.gz
Tests related to e62e0abd2fbdfd2512c292ef95d4d152a5ca0691
RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=317148258
-rw-r--r--factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java11
-rw-r--r--factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java5
-rw-r--r--factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java38
-rw-r--r--factory/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java39
-rw-r--r--factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java22
5 files changed, 115 insertions, 0 deletions
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java b/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
index be9478fc..4c4a38af 100644
--- a/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
+++ b/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
@@ -15,6 +15,7 @@
*/
package com.google.auto.factory;
+import com.google.auto.factory.otherpackage.OtherPackage;
import dagger.Module;
import dagger.Provides;
@@ -45,4 +46,14 @@ final class DaggerModule {
Number provideNumber() {
return 3;
}
+
+ @Provides
+ ReferencePackage provideReferencePackage(ReferencePackageFactory factory) {
+ return factory.create(17);
+ }
+
+ @Provides
+ OtherPackage provideOtherPackage() {
+ return new OtherPackage(null, 23);
+ }
}
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java b/factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java
index 7d0a1627..b5bbe3d9 100644
--- a/factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java
+++ b/factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java
@@ -15,6 +15,7 @@
*/
package com.google.auto.factory;
+import com.google.auto.factory.otherpackage.OtherPackageFactory;
import dagger.Component;
/** A component to materialize the factory using Dagger 2 */
@@ -23,4 +24,8 @@ interface FactoryComponent {
FooFactory factory();
GenericFooFactory<Number> generatedFactory();
+
+ ReferencePackageFactory referencePackageFactory();
+
+ OtherPackageFactory otherPackageFactory();
}
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java b/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
new file mode 100644
index 00000000..22aff651
--- /dev/null
+++ b/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.auto.factory;
+
+import com.google.auto.factory.otherpackage.OtherPackage;
+import com.google.auto.factory.otherpackage.OtherPackageFactory;
+import javax.inject.Inject;
+
+@AutoFactory
+public class ReferencePackage {
+ private final OtherPackageFactory otherPackageFactory;
+ private final int random;
+
+ @Inject
+ public ReferencePackage(
+ @Provided OtherPackageFactory otherPackageFactory,
+ int random) {
+ this.otherPackageFactory = otherPackageFactory;
+ this.random = random;
+ }
+
+ public OtherPackage otherPackage() {
+ return otherPackageFactory.create(random);
+ }
+}
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java b/factory/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java
new file mode 100644
index 00000000..b9925a18
--- /dev/null
+++ b/factory/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.auto.factory.otherpackage;
+
+import com.google.auto.factory.AutoFactory;
+import com.google.auto.factory.Provided;
+import com.google.auto.factory.ReferencePackageFactory;
+
+@AutoFactory
+public class OtherPackage {
+ private final ReferencePackageFactory referencePackageFactory;
+ private final int random;
+
+ public OtherPackage(@Provided ReferencePackageFactory referencePackageFactory, int random) {
+ this.referencePackageFactory = referencePackageFactory;
+ this.random = random;
+ }
+
+ public ReferencePackageFactory referencePackageFactory() {
+ return referencePackageFactory;
+ }
+
+ public int random() {
+ return random;
+ }
+}
diff --git a/factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java b/factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java
index ebd83367..e1412117 100644
--- a/factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java
+++ b/factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java
@@ -4,6 +4,7 @@ import static com.google.common.truth.Truth.assertThat;
import com.google.auto.factory.GenericFoo.DepE;
import com.google.auto.factory.GenericFoo.IntAndStringAccessor;
+import com.google.auto.factory.otherpackage.OtherPackage;
import com.google.common.collect.ImmutableList;
import com.google.inject.Guice;
import com.google.inject.Key;
@@ -64,6 +65,16 @@ public class DependencyInjectionIntegrationTest {
assertThat(four.getDepE()).isEqualTo(DepE.VALUE_2);
}
+ @Test
+ public void daggerInjectedPackageSpanningFactory() {
+ FactoryComponent component = DaggerFactoryComponent.create();
+ ReferencePackageFactory referencePackageFactory = component.referencePackageFactory();
+ ReferencePackage referencePackage = referencePackageFactory.create(5);
+ OtherPackage otherPackage = referencePackage.otherPackage();
+ assertThat(otherPackage.referencePackageFactory()).isNotSameInstanceAs(referencePackageFactory);
+ assertThat(otherPackage.random()).isEqualTo(5);
+ }
+
@Test public void guiceInjectedFactory() {
FooFactory fooFactory = Guice.createInjector(new GuiceModule()).getInstance(FooFactory.class);
Foo one = fooFactory.create("A");
@@ -109,4 +120,15 @@ public class DependencyInjectionIntegrationTest {
assertThat(four.passThrough(5L)).isEqualTo(5L);
assertThat(four.getDepE()).isEqualTo(DepE.VALUE_2);
}
+
+ @Test
+ public void guiceInjectedPackageSpanningFactory() {
+ ReferencePackageFactory referencePackageFactory =
+ Guice.createInjector(new GuiceModule())
+ .getInstance(ReferencePackageFactory.class);
+ ReferencePackage referencePackage = referencePackageFactory.create(5);
+ OtherPackage otherPackage = referencePackage.otherPackage();
+ assertThat(otherPackage.referencePackageFactory()).isNotSameInstanceAs(referencePackageFactory);
+ assertThat(otherPackage.random()).isEqualTo(5);
+ }
}