Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vitaliy.Bibaev
2016-12-16 16:42:13 +03:00
23 changed files with 320 additions and 1228 deletions
@@ -35,7 +35,6 @@ public class CompilerReferencesFindUsagesTest extends DaemonAnalyzerTestCase {
public void setUp() throws Exception {
myDefaultEnableState = CompilerReferenceService.IS_ENABLED_KEY.asBoolean();
CompilerReferenceService.IS_ENABLED_KEY.setValue(true);
CompilerReferenceService.enabledInTests = true;
super.setUp();
myCompilerTester = new CompilerTester(myModule);
}
@@ -44,7 +43,6 @@ public class CompilerReferencesFindUsagesTest extends DaemonAnalyzerTestCase {
public void tearDown() throws Exception {
try {
CompilerReferenceService.IS_ENABLED_KEY.setValue(myDefaultEnableState);
CompilerReferenceService.enabledInTests = false;
myCompilerTester.tearDown();
}
finally {
@@ -24,14 +24,12 @@ public abstract class CompilerReferencesTestBase extends AbstractCompilerAwareTe
public void setUp() throws Exception {
myDefaultEnableState = CompilerReferenceService.IS_ENABLED_KEY.asBoolean();
CompilerReferenceService.IS_ENABLED_KEY.setValue(true);
CompilerReferenceService.enabledInTests = true;
super.setUp();
}
@Override
public void tearDown() throws Exception {
CompilerReferenceService.IS_ENABLED_KEY.setValue(myDefaultEnableState);
CompilerReferenceService.enabledInTests = false;
super.tearDown();
}
}