Break up the test files so that it's clear which test files are expected to work.
diff --git a/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java b/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java
index d576699..68167c8 100644
--- a/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java
+++ b/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java
@@ -23,7 +23,6 @@
import org.junit.Test;
-import com.google.auto.factory.processor.AutoFactoryProcessor;
import com.google.common.collect.ImmutableSet;
import com.google.testing.compile.JavaFileObjects;
@@ -33,98 +32,98 @@
public class AutoFactoryProcessorTest {
@Test public void simpleClass() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/SimpleClass.java"))
+ .that(JavaFileObjects.forResource("good/SimpleClass.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
- .and().generatesSources(JavaFileObjects.forResource("tests/SimpleClassFactory.java"));
+ .and().generatesSources(JavaFileObjects.forResource("expected/SimpleClassFactory.java"));
}
@Test public void publicClass() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/PublicClass.java"))
+ .that(JavaFileObjects.forResource("good/PublicClass.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
- .and().generatesSources(JavaFileObjects.forResource("tests/PublicClassFactory.java"));
+ .and().generatesSources(JavaFileObjects.forResource("expected/PublicClassFactory.java"));
}
@Test public void simpleClassCustomName() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/SimpleClassCustomName.java"))
+ .that(JavaFileObjects.forResource("good/SimpleClassCustomName.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
- .and().generatesSources(JavaFileObjects.forResource("tests/CustomNamedFactory.java"));
+ .and().generatesSources(JavaFileObjects.forResource("expected/CustomNamedFactory.java"));
}
@Test public void simpleClassMixedDeps() {
ASSERT.about(javaSources())
.that(ImmutableSet.of(
- JavaFileObjects.forResource("tests/SimpleClassMixedDeps.java"),
- JavaFileObjects.forResource("tests/AQualifier.java")))
+ JavaFileObjects.forResource("good/SimpleClassMixedDeps.java"),
+ JavaFileObjects.forResource("aux/AQualifier.java")))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(
- JavaFileObjects.forResource("tests/SimpleClassMixedDepsFactory.java"));
+ JavaFileObjects.forResource("expected/SimpleClassMixedDepsFactory.java"));
}
@Test public void simpleClassPassedDeps() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/SimpleClassPassedDeps.java"))
+ .that(JavaFileObjects.forResource("good/SimpleClassPassedDeps.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(
- JavaFileObjects.forResource("tests/SimpleClassPassedDepsFactory.java"));
+ JavaFileObjects.forResource("expected/SimpleClassPassedDepsFactory.java"));
}
@Test public void simpleClassProvidedDeps() {
ASSERT.about(javaSources())
.that(ImmutableSet.of(
- JavaFileObjects.forResource("tests/AQualifier.java"),
- JavaFileObjects.forResource("tests/BQualifier.java"),
- JavaFileObjects.forResource("tests/SimpleClassProvidedDeps.java")))
+ JavaFileObjects.forResource("aux/AQualifier.java"),
+ JavaFileObjects.forResource("aux/BQualifier.java"),
+ JavaFileObjects.forResource("good/SimpleClassProvidedDeps.java")))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(
- JavaFileObjects.forResource("tests/SimpleClassProvidedDepsFactory.java"));
+ JavaFileObjects.forResource("expected/SimpleClassProvidedDepsFactory.java"));
}
@Test public void constructorAnnotated() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/ConstructorAnnotated.java"))
+ .that(JavaFileObjects.forResource("good/ConstructorAnnotated.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(
- JavaFileObjects.forResource("tests/ConstructorAnnotatedFactory.java"));
+ JavaFileObjects.forResource("expected/ConstructorAnnotatedFactory.java"));
}
@Test public void simpleClassImplementingMarker() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/SimpleClassImplementingMarker.java"))
+ .that(JavaFileObjects.forResource("good/SimpleClassImplementingMarker.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(
- JavaFileObjects.forResource("tests/SimpleClassImplementingMarkerFactory.java"));
+ JavaFileObjects.forResource("expected/SimpleClassImplementingMarkerFactory.java"));
}
@Test public void simpleClassImplementingSimpleInterface() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/SimpleClassImplementingSimpleInterface.java"))
+ .that(JavaFileObjects.forResource("good/SimpleClassImplementingSimpleInterface.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(JavaFileObjects.forResource(
- "tests/SimpleClassImplementingSimpleInterfaceFactory.java"));
+ "expected/SimpleClassImplementingSimpleInterfaceFactory.java"));
}
@Test public void mixedDepsImplementingInterfaces() {
ASSERT.about(javaSource())
- .that(JavaFileObjects.forResource("tests/MixedDepsImplementingInterfaces.java"))
+ .that(JavaFileObjects.forResource("good/MixedDepsImplementingInterfaces.java"))
.processedWith(new AutoFactoryProcessor())
.compilesWithoutError()
.and().generatesSources(
- JavaFileObjects.forResource("tests/MixedDepsImplementingInterfacesFactory.java"));
+ JavaFileObjects.forResource("expected/MixedDepsImplementingInterfacesFactory.java"));
}
@Test public void failsOnGenericClass() {
- JavaFileObject file = JavaFileObjects.forResource("tests/GenericClass.java");
+ JavaFileObject file = JavaFileObjects.forResource("bad/GenericClass.java");
ASSERT.about(javaSource())
.that(file)
.processedWith(new AutoFactoryProcessor())
@@ -134,7 +133,7 @@
}
@Test public void providedButNoAutoFactory() {
- JavaFileObject file = JavaFileObjects.forResource("tests/ProvidedButNoAutoFactory.java");
+ JavaFileObject file = JavaFileObjects.forResource("bad/ProvidedButNoAutoFactory.java");
ASSERT.about(javaSource())
.that(file)
.processedWith(new AutoFactoryProcessor())
@@ -145,7 +144,7 @@
}
@Test public void providedOnMethodParameter() {
- JavaFileObject file = JavaFileObjects.forResource("tests/ProvidedOnMethodParameter.java");
+ JavaFileObject file = JavaFileObjects.forResource("bad/ProvidedOnMethodParameter.java");
ASSERT.about(javaSource())
.that(file)
.processedWith(new AutoFactoryProcessor())
@@ -156,7 +155,7 @@
}
@Test public void invalidCustomName() {
- JavaFileObject file = JavaFileObjects.forResource("tests/InvalidCustomName.java");
+ JavaFileObject file = JavaFileObjects.forResource("bad/InvalidCustomName.java");
ASSERT.about(javaSource())
.that(file)
.processedWith(new AutoFactoryProcessor())
diff --git a/factory/src/test/resources/tests/AQualifier.java b/factory/src/test/resources/aux/AQualifier.java
similarity index 100%
rename from factory/src/test/resources/tests/AQualifier.java
rename to factory/src/test/resources/aux/AQualifier.java
diff --git a/factory/src/test/resources/tests/BQualifier.java b/factory/src/test/resources/aux/BQualifier.java
similarity index 100%
rename from factory/src/test/resources/tests/BQualifier.java
rename to factory/src/test/resources/aux/BQualifier.java
diff --git a/factory/src/test/resources/tests/GenericClass.java b/factory/src/test/resources/bad/GenericClass.java
similarity index 100%
rename from factory/src/test/resources/tests/GenericClass.java
rename to factory/src/test/resources/bad/GenericClass.java
diff --git a/factory/src/test/resources/tests/InvalidCustomName.java b/factory/src/test/resources/bad/InvalidCustomName.java
similarity index 100%
rename from factory/src/test/resources/tests/InvalidCustomName.java
rename to factory/src/test/resources/bad/InvalidCustomName.java
diff --git a/factory/src/test/resources/tests/ProvidedButNoAutoFactory.java b/factory/src/test/resources/bad/ProvidedButNoAutoFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/ProvidedButNoAutoFactory.java
rename to factory/src/test/resources/bad/ProvidedButNoAutoFactory.java
diff --git a/factory/src/test/resources/tests/ProvidedOnMethodParameter.java b/factory/src/test/resources/bad/ProvidedOnMethodParameter.java
similarity index 100%
rename from factory/src/test/resources/tests/ProvidedOnMethodParameter.java
rename to factory/src/test/resources/bad/ProvidedOnMethodParameter.java
diff --git a/factory/src/test/resources/tests/ConstructorAnnotatedFactory.java b/factory/src/test/resources/expected/ConstructorAnnotatedFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/ConstructorAnnotatedFactory.java
rename to factory/src/test/resources/expected/ConstructorAnnotatedFactory.java
diff --git a/factory/src/test/resources/tests/CustomNamedFactory.java b/factory/src/test/resources/expected/CustomNamedFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/CustomNamedFactory.java
rename to factory/src/test/resources/expected/CustomNamedFactory.java
diff --git a/factory/src/test/resources/tests/MixedDepsImplementingInterfacesFactory.java b/factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/MixedDepsImplementingInterfacesFactory.java
rename to factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java
diff --git a/factory/src/test/resources/tests/PublicClassFactory.java b/factory/src/test/resources/expected/PublicClassFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/PublicClassFactory.java
rename to factory/src/test/resources/expected/PublicClassFactory.java
diff --git a/factory/src/test/resources/tests/SimpleClassFactory.java b/factory/src/test/resources/expected/SimpleClassFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassFactory.java
rename to factory/src/test/resources/expected/SimpleClassFactory.java
diff --git a/factory/src/test/resources/tests/SimpleClassImplementingMarkerFactory.java b/factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassImplementingMarkerFactory.java
rename to factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java
diff --git a/factory/src/test/resources/tests/SimpleClassImplementingSimpleInterfaceFactory.java b/factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassImplementingSimpleInterfaceFactory.java
rename to factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java
diff --git a/factory/src/test/resources/tests/SimpleClassMixedDepsFactory.java b/factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassMixedDepsFactory.java
rename to factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java
diff --git a/factory/src/test/resources/tests/SimpleClassPassedDepsFactory.java b/factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassPassedDepsFactory.java
rename to factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java
diff --git a/factory/src/test/resources/tests/SimpleClassProvidedDepsFactory.java b/factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassProvidedDepsFactory.java
rename to factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java
diff --git a/factory/src/test/resources/tests/ConstructorAnnotated.java b/factory/src/test/resources/good/ConstructorAnnotated.java
similarity index 100%
rename from factory/src/test/resources/tests/ConstructorAnnotated.java
rename to factory/src/test/resources/good/ConstructorAnnotated.java
diff --git a/factory/src/test/resources/tests/MixedDepsImplementingInterfaces.java b/factory/src/test/resources/good/MixedDepsImplementingInterfaces.java
similarity index 100%
rename from factory/src/test/resources/tests/MixedDepsImplementingInterfaces.java
rename to factory/src/test/resources/good/MixedDepsImplementingInterfaces.java
diff --git a/factory/src/test/resources/tests/PublicClass.java b/factory/src/test/resources/good/PublicClass.java
similarity index 100%
rename from factory/src/test/resources/tests/PublicClass.java
rename to factory/src/test/resources/good/PublicClass.java
diff --git a/factory/src/test/resources/tests/SimpleClass.java b/factory/src/test/resources/good/SimpleClass.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClass.java
rename to factory/src/test/resources/good/SimpleClass.java
diff --git a/factory/src/test/resources/tests/SimpleClassCustomName.java b/factory/src/test/resources/good/SimpleClassCustomName.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassCustomName.java
rename to factory/src/test/resources/good/SimpleClassCustomName.java
diff --git a/factory/src/test/resources/tests/SimpleClassImplementingMarker.java b/factory/src/test/resources/good/SimpleClassImplementingMarker.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassImplementingMarker.java
rename to factory/src/test/resources/good/SimpleClassImplementingMarker.java
diff --git a/factory/src/test/resources/tests/SimpleClassImplementingSimpleInterface.java b/factory/src/test/resources/good/SimpleClassImplementingSimpleInterface.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassImplementingSimpleInterface.java
rename to factory/src/test/resources/good/SimpleClassImplementingSimpleInterface.java
diff --git a/factory/src/test/resources/tests/SimpleClassMixedDeps.java b/factory/src/test/resources/good/SimpleClassMixedDeps.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassMixedDeps.java
rename to factory/src/test/resources/good/SimpleClassMixedDeps.java
diff --git a/factory/src/test/resources/tests/SimpleClassPassedDeps.java b/factory/src/test/resources/good/SimpleClassPassedDeps.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassPassedDeps.java
rename to factory/src/test/resources/good/SimpleClassPassedDeps.java
diff --git a/factory/src/test/resources/tests/SimpleClassProvidedDeps.java b/factory/src/test/resources/good/SimpleClassProvidedDeps.java
similarity index 100%
rename from factory/src/test/resources/tests/SimpleClassProvidedDeps.java
rename to factory/src/test/resources/good/SimpleClassProvidedDeps.java
