diff --git a/json/tests/test/com/intellij/json/JsonEditingTest.java b/json/tests/test/com/intellij/json/JsonEditingTest.java index 082b8371eadd..d561401b1ad8 100644 --- a/json/tests/test/com/intellij/json/JsonEditingTest.java +++ b/json/tests/test/com/intellij/json/JsonEditingTest.java @@ -16,13 +16,10 @@ public class JsonEditingTest extends JsonTestCase { final String testName = "editing/" + getTestName(false); myFixture.configureByFile(testName + ".json"); final int offset = myFixture.getEditor().getCaretModel().getOffset(); - WriteCommandAction.runWriteCommandAction(null, new Computable() { - @Override - public PsiFile compute() { - myFixture.getEditor().getCaretModel().moveToOffset(offset); - myFixture.type(characters); - return myFixture.getFile(); - } + WriteCommandAction.runWriteCommandAction(null, (Computable)() -> { + myFixture.getEditor().getCaretModel().moveToOffset(offset); + myFixture.type(characters); + return myFixture.getFile(); }); myFixture.checkResultByFile(testName + ".after.json"); } diff --git a/json/tests/test/com/intellij/json/JsonLiveTemplateTest.java b/json/tests/test/com/intellij/json/JsonLiveTemplateTest.java index 87e02eabcf9f..c4b0822d8131 100644 --- a/json/tests/test/com/intellij/json/JsonLiveTemplateTest.java +++ b/json/tests/test/com/intellij/json/JsonLiveTemplateTest.java @@ -59,14 +59,11 @@ public class JsonLiveTemplateTest extends JsonTestCase { createJsonTemplate("foo", "foo", templateContent); myFixture.configureByText(JsonFileType.INSTANCE, "foo"); final Editor editor = myFixture.getEditor(); - WriteCommandAction.runWriteCommandAction(null, new Runnable() { - @Override - public void run() { - new ListTemplatesAction().actionPerformedImpl(getProject(), editor); - final LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(editor); - assertNotNull(lookup); - lookup.finishLookup(Lookup.NORMAL_SELECT_CHAR); - } + WriteCommandAction.runWriteCommandAction(null, () -> { + new ListTemplatesAction().actionPerformedImpl(getProject(), editor); + final LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(editor); + assertNotNull(lookup); + lookup.finishLookup(Lookup.NORMAL_SELECT_CHAR); }); myFixture.checkResult(templateContent.replaceAll("\\$.*?\\$", "")); } diff --git a/json/tests/test/com/intellij/json/JsonTestCase.java b/json/tests/test/com/intellij/json/JsonTestCase.java index 4ea65effa00a..c91e1598a9ad 100644 --- a/json/tests/test/com/intellij/json/JsonTestCase.java +++ b/json/tests/test/com/intellij/json/JsonTestCase.java @@ -19,8 +19,6 @@ public abstract class JsonTestCase extends LightCodeInsightFixtureTestCase { Logger.setFactory(TestLoggerFactory.class); } - protected static final Logger LOG = Logger.getInstance(JsonTestCase.class); - @Override public void setUp() throws Exception { PlatformTestCase.autodetectPlatformPrefix();