diff --git a/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java b/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java index edfa73b4a5ce..44cecdbfd029 100644 --- a/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java +++ b/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import java.util.Map; * @author cdr */ public class SliceBackwardTest extends SliceTestCase { - private final TIntObjectHashMap myFlownOffsets = new TIntObjectHashMap(); + private final TIntObjectHashMap myFlownOffsets = new TIntObjectHashMap<>(); private void doTest() throws Exception { configureByFile("/codeInsight/slice/backward/"+getTestName(false)+".java"); diff --git a/java/java-tests/testSrc/com/intellij/slicer/SliceForwardTest.java b/java/java-tests/testSrc/com/intellij/slicer/SliceForwardTest.java index 9348a1cb4c8e..978b30a5f39c 100644 --- a/java/java-tests/testSrc/com/intellij/slicer/SliceForwardTest.java +++ b/java/java-tests/testSrc/com/intellij/slicer/SliceForwardTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import java.util.Map; * @author cdr */ public class SliceForwardTest extends DaemonAnalyzerTestCase { - private final TIntObjectHashMap myFlownOffsets = new TIntObjectHashMap(); + private final TIntObjectHashMap myFlownOffsets = new TIntObjectHashMap<>(); private void dotest() throws Exception { configureByFile("/codeInsight/slice/forward/"+getTestName(false)+".java"); diff --git a/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java b/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java index 319ef2d95041..e8bccf44123e 100644 --- a/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java +++ b/java/java-tests/testSrc/com/intellij/slicer/SliceTreeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class SliceTreeTest extends SliceTestCase { if (node.getDuplicate() != null) { PsiElement element = node.getValue().getElement(); hasDups.add(element.getTextRange().getStartOffset()); - assertTrue(element instanceof PsiParameter && ((PsiParameter)element).getName().equals("i") || element instanceof PsiLiteralExpression); + assertTrue(element instanceof PsiParameter && "i".equals(((PsiParameter)element).getName()) || element instanceof PsiLiteralExpression); } } @@ -121,7 +121,7 @@ public class SliceTreeTest extends SliceTestCase { int i = hasDups.indexOf(offset); assertTrue(i != -1); hasDups.remove(i); - assertTrue(element instanceof PsiParameter && ((PsiParameter)element).getName().equals("i") || element instanceof PsiLiteralExpression); + assertTrue(element instanceof PsiParameter && "i".equals(((PsiParameter)element).getName()) || element instanceof PsiLiteralExpression); } } assertTrue(hasDups.isEmpty());