Skip to content

Commit

Permalink
Remove CompilationTestHelper.newInstance(BugChecker, Class<?>)
Browse files Browse the repository at this point in the history
It's misleading, because it doesn't allow per-instance state to be propagated
through: we call getClass() and then drop the instance that's passed in.

RELNOTES: N/A
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=92514999
  • Loading branch information
cushon committed May 13, 2015
1 parent 073ddda commit 99cdb79
Show file tree
Hide file tree
Showing 101 changed files with 111 additions and 130 deletions.
Expand Up @@ -80,19 +80,6 @@ public static CompilationTestHelper newInstance(ScannerSupplier scannerSupplier,
return new CompilationTestHelper(scannerSupplier, null, clazz);
}

/**
* Returns a new {@link CompilationTestHelper}.
*
* @param checker the {@link BugChecker} to test
* @param clazz the class to use to locate file resources
*/
// TODO(user): deprecate and migrate to newInstance(Class<? extends BugChecker>, Class<?>)
// This version is misleading, because it doesn't allow per-instance state to be propagated
// through: we call getClass() and then drop the instance that's passed in.
public static CompilationTestHelper newInstance(BugChecker checker, Class<?> clazz) {
return newInstance(checker.getClass(), clazz);
}

/**
* Returns a new {@link CompilationTestHelper}.
*
Expand Down
Expand Up @@ -45,7 +45,7 @@ public class CompilationTestHelperTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ReturnTreeChecker(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ReturnTreeChecker.class, getClass());
}

@Test
Expand Down
Expand Up @@ -36,7 +36,7 @@ public class ArrayEqualsTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ArrayEquals(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ArrayEquals.class, getClass());
}

@Test
Expand Down
Expand Up @@ -36,7 +36,7 @@ public class ArrayHashCodeTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ArrayHashCode(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ArrayHashCode.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class ArrayToStringCompoundAssignmentTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new ArrayToStringCompoundAssignment(), getClass());
CompilationTestHelper.newInstance(ArrayToStringCompoundAssignment.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class ArrayToStringConcatenationTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new ArrayToStringConcatenation(), getClass());
CompilationTestHelper.newInstance(ArrayToStringConcatenation.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class ArrayToStringTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ArrayToString(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ArrayToString.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class AssertFalseTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new AssertFalse(), getClass());
compilationHelper = CompilationTestHelper.newInstance(AssertFalse.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class AsyncFunctionReturnsNullTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new AsyncFunctionReturnsNull(), getClass());
CompilationTestHelper.newInstance(AsyncFunctionReturnsNull.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class BadShiftAmountTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new BadShiftAmount(), getClass());
compilationHelper = CompilationTestHelper.newInstance(BadShiftAmount.class, getClass());
}

@Test
Expand Down
Expand Up @@ -43,7 +43,7 @@ public class CannotMockFinalClassTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new CannotMockFinalClass(), getClass());
compilationHelper = CompilationTestHelper.newInstance(CannotMockFinalClass.class, getClass());
}

static final class FinalClass {
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class ChainingConstructorIgnoresParameterTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new ChainingConstructorIgnoresParameter(), getClass());
CompilationTestHelper.newInstance(ChainingConstructorIgnoresParameter.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class CheckReturnValueTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new CheckReturnValue(), getClass());
compilationHelper = CompilationTestHelper.newInstance(CheckReturnValue.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class ClassCanBeStaticTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ClassCanBeStatic(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ClassCanBeStatic.class, getClass());
}

@Test
Expand Down
Expand Up @@ -31,7 +31,7 @@ public class ClassNameTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ClassName(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ClassName.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class CollectionIncompatibleTypeTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new CollectionIncompatibleType(), getClass());
CompilationTestHelper.newInstance(CollectionIncompatibleType.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class ComparisonOutOfRangeTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ComparisonOutOfRange(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ComparisonOutOfRange.class, getClass());
}

@Test
Expand Down
Expand Up @@ -36,7 +36,7 @@ public class CompileTimeConstantCheckerTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new CompileTimeConstantChecker(), getClass());
CompilationTestHelper.newInstance(CompileTimeConstantChecker.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class CovariantEqualsTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new CovariantEquals(), getClass());
compilationHelper = CompilationTestHelper.newInstance(CovariantEquals.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class DeadExceptionTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new DeadException(), getClass());
compilationHelper = CompilationTestHelper.newInstance(DeadException.class, getClass());
}

@Test
Expand Down
Expand Up @@ -32,7 +32,7 @@ public class DepAnnTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new DepAnn(), getClass());
compilationHelper = CompilationTestHelper.newInstance(DepAnn.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class DivZeroTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new DivZero(), getClass());
compilationHelper = CompilationTestHelper.newInstance(DivZero.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class ElementsCountedInLoopTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new ElementsCountedInLoop(), getClass());
compilationHelper = CompilationTestHelper.newInstance(ElementsCountedInLoop.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class EmptyIfStatementTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new EmptyIfStatement(), getClass());
compilationHelper = CompilationTestHelper.newInstance(EmptyIfStatement.class, getClass());
}

@Test
Expand Down
Expand Up @@ -30,7 +30,7 @@ public class EqualsHashCodeTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new EqualsHashCode(), getClass());
compilationHelper = CompilationTestHelper.newInstance(EqualsHashCode.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class EqualsNaNTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new EqualsNaN(), getClass());
compilationHelper = CompilationTestHelper.newInstance(EqualsNaN.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class FinallyTest {

@Before
public void setUp() {
compilationHelper = CompilationTestHelper.newInstance(new Finally(), getClass());
compilationHelper = CompilationTestHelper.newInstance(Finally.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class ForOverrideCheckerTest {
@Before
public void setUp() throws Exception {
compilationHelper = CompilationTestHelper
.newInstance(new ForOverrideChecker(), getClass())
.newInstance(ForOverrideChecker.class, getClass())
.addSourceLines(
"test/ExtendMe.java",
"package test;",
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class GuiceAssistedInjectScopingTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new GuiceAssistedInjectScoping(), getClass());
CompilationTestHelper.newInstance(GuiceAssistedInjectScoping.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class GuiceAssistedParametersTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new GuiceAssistedParameters(), getClass());
CompilationTestHelper.newInstance(GuiceAssistedParameters.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class GuiceInjectOnFinalFieldTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new GuiceInjectOnFinalField(), getClass());
CompilationTestHelper.newInstance(GuiceInjectOnFinalField.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class GuiceOverridesGuiceInjectableMethodTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new GuiceOverridesGuiceInjectableMethod(), getClass());
CompilationTestHelper.newInstance(GuiceOverridesGuiceInjectableMethod.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class GuiceOverridesJavaxInjectableMethodTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new GuiceOverridesJavaxInjectableMethod(), getClass());
CompilationTestHelper.newInstance(GuiceOverridesJavaxInjectableMethod.class, getClass());
}

@Test
Expand Down
Expand Up @@ -36,7 +36,7 @@ public class IncompatibleModifiersCheckerTest {
@Before
public void setUp() {
compilationHelper = CompilationTestHelper
.newInstance(new IncompatibleModifiersChecker(), getClass())
.newInstance(IncompatibleModifiersChecker.class, getClass())
.addSourceLines(
"test/NotPrivateOrFinal.java",
"package test;",
Expand Down
Expand Up @@ -35,7 +35,7 @@ public class InjectAssistedInjectAndInjectOnConstructorsTest {
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(
new InjectAssistedInjectAndInjectOnConstructors(), getClass());
InjectAssistedInjectAndInjectOnConstructors.class, getClass());
}

@Test
Expand Down
Expand Up @@ -35,7 +35,7 @@ public class InjectAssistedInjectAndInjectOnSameConstructorTest {
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(
new InjectAssistedInjectAndInjectOnSameConstructor(), getClass());
InjectAssistedInjectAndInjectOnSameConstructor.class, getClass());
}

@Test
Expand Down
Expand Up @@ -35,7 +35,7 @@ public class InjectInvalidTargetingOnScopingAnnotationTest {
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(
new InjectInvalidTargetingOnScopingAnnotation(), getClass());
InjectInvalidTargetingOnScopingAnnotation.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class InjectJavaxInjectOnAbstractMethodTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new InjectJavaxInjectOnAbstractMethod(), getClass());
CompilationTestHelper.newInstance(InjectJavaxInjectOnAbstractMethod.class, getClass());
}

@Test
Expand Down
Expand Up @@ -33,7 +33,7 @@ public class InjectJavaxInjectOnFinalFieldTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new InjectJavaxInjectOnFinalField(), getClass());
CompilationTestHelper.newInstance(InjectJavaxInjectOnFinalField.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class InjectMoreThanOneInjectableConstructorTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new InjectMoreThanOneInjectableConstructor(), getClass());
CompilationTestHelper.newInstance(InjectMoreThanOneInjectableConstructor.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class InjectMoreThanOneQualifierTest {
@Before
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(new InjectMoreThanOneQualifier(), getClass());
CompilationTestHelper.newInstance(InjectMoreThanOneQualifier.class, getClass());
}

@Test
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class InjectMoreThanOneScopeAnnotationOnClassTest {
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(
new InjectMoreThanOneScopeAnnotationOnClass(), getClass());
InjectMoreThanOneScopeAnnotationOnClass.class, getClass());
}

@Test
Expand Down
Expand Up @@ -35,7 +35,7 @@ public class InjectOverlappingQualifierAndScopeAnnotationTest {
public void setUp() {
compilationHelper =
CompilationTestHelper.newInstance(
new InjectOverlappingQualifierAndScopeAnnotation(), getClass());
InjectOverlappingQualifierAndScopeAnnotation.class, getClass());
}

@Test
Expand Down

0 comments on commit 99cdb79

Please sign in to comment.