From 6a6acdf771c603652387fc170c9f55bb3f2b2ae5 Mon Sep 17 00:00:00 2001 From: Konstantin Nisht Date: Wed, 14 Apr 2021 21:13:58 +0300 Subject: [PATCH] [groovy] Fix tests failed because of changed description GitOrigin-RevId: 71e76ae96bb2af42e4d85600d8e7edda2812ebb4 --- ...GroovyPointlessBooleanInspectionTest.groovy | 14 +++++++------- .../GrResultOfAssignmentUsedTest.groovy | 18 ++---------------- .../highlighting/DontSimplifyString.groovy | 4 ++-- .../testdata/highlighting/RangeType.groovy | 2 +- .../highlighting/ResultOfAssignmentUsed.groovy | 4 ++-- .../highlighting/ResultOfIncUsed.groovy | 4 ++-- 6 files changed, 16 insertions(+), 30 deletions(-) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspectionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspectionTest.groovy index 2ed81b823295..331a8483dfb2 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspectionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspectionTest.groovy @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.codeInspection.confusing import com.intellij.codeInspection.LocalInspectionTool @@ -18,20 +18,20 @@ class GroovyPointlessBooleanInspectionTest extends GroovyLatestTest implements H @Test void 'simple unary'() { - doTest($/!false/$, 'true') - doTest($/!true/$, 'false') + doTest($/!false/$, 'true') + doTest($/!true/$, 'false') } @Test void 'double-negation unary'() { - doTest($/!!false/$, 'false') - doTest($/!!true/$, 'true') + doTest($/!!false/$, 'false') + doTest($/!!true/$, 'true') } @Test void 'triple-negation unary'() { - doTest($/!!!false/$, '!false') - doTest($/!!!true/$, '!true') + doTest($/!!!false/$, '!false') + doTest($/!!!true/$, '!true') } private void doTest(String before, String after) { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrResultOfAssignmentUsedTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrResultOfAssignmentUsedTest.groovy index cd094170d668..1db455e57e31 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrResultOfAssignmentUsedTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrResultOfAssignmentUsedTest.groovy @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2015 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.lang.highlighting import com.intellij.codeInspection.InspectionProfileEntry @@ -24,7 +10,7 @@ class GrResultOfAssignmentUsedTest extends GrHighlightingTestBase { @Override InspectionProfileEntry[] getCustomInspections() { [inspection] } - final warnStart = '' + final warnStart = '' final warnEnd = '' void testUsedVar() { diff --git a/plugins/groovy/testdata/highlighting/DontSimplifyString.groovy b/plugins/groovy/testdata/highlighting/DontSimplifyString.groovy index 7cd3204eef3c..15c548d6674f 100644 --- a/plugins/groovy/testdata/highlighting/DontSimplifyString.groovy +++ b/plugins/groovy/testdata/highlighting/DontSimplifyString.groovy @@ -15,11 +15,11 @@ Boolean getSchedule2() { } boolean getSchedule3(boolean cronExpression) { - return cronExpression ? true : false + return cronExpression ? true : false } boolean getSchedule4(Boolean cronExpression) { - return cronExpression ? true : false + return cronExpression ? true : false } diff --git a/plugins/groovy/testdata/highlighting/RangeType.groovy b/plugins/groovy/testdata/highlighting/RangeType.groovy index d85aa9b7ce3d..71b1f0e91ea0 100644 --- a/plugins/groovy/testdata/highlighting/RangeType.groovy +++ b/plugins/groovy/testdata/highlighting/RangeType.groovy @@ -1,4 +1,4 @@ class Foo { } -print new Foo()..new Foo() \ No newline at end of file +print new Foo()..new Foo() \ No newline at end of file diff --git a/plugins/groovy/testdata/highlighting/ResultOfAssignmentUsed.groovy b/plugins/groovy/testdata/highlighting/ResultOfAssignmentUsed.groovy index cb5fb5b198a9..48aba2a4493c 100644 --- a/plugins/groovy/testdata/highlighting/ResultOfAssignmentUsed.groovy +++ b/plugins/groovy/testdata/highlighting/ResultOfAssignmentUsed.groovy @@ -3,13 +3,13 @@ public class AssResult { String vs = 'prefix' if (b) vs += ps // no warning if (b) { vs += ps } // no warning - print vs = 4 + print vs = 4 println ps } def assUsed() { def a = 2 - a = 3 + a = 3 } void assIsNotUsed() { diff --git a/plugins/groovy/testdata/highlighting/ResultOfIncUsed.groovy b/plugins/groovy/testdata/highlighting/ResultOfIncUsed.groovy index 9f4a783c528a..9c685f561e04 100644 --- a/plugins/groovy/testdata/highlighting/ResultOfIncUsed.groovy +++ b/plugins/groovy/testdata/highlighting/ResultOfIncUsed.groovy @@ -1,5 +1,5 @@ for (int i=0;i<10; i++) { - def x = i++ + def x = i++ } def x= 0 @@ -8,5 +8,5 @@ if (true) x++ print x def foo(d) { - d++ //used in return + d++ //used in return } \ No newline at end of file