From fb2f4a19c8aef51fe78caa334d8a84043082094c Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 27 Apr 2017 14:32:21 +0200 Subject: [PATCH] SSR: simplify/centralize setting and resetting of universal matching in tests --- .../intellij/structuralsearch/StructuralReplaceTestCase.java | 4 +--- .../intellij/structuralsearch/StructuralSearchTestCase.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java index 73919809291a..336ae274ac89 100644 --- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -41,8 +41,6 @@ abstract class StructuralReplaceTestCase extends LightQuickFixTestCase { protected void setUp() throws Exception { super.setUp(); - StructuralSearchUtil.ourUseUniversalMatchingAlgorithm = false; - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_4); options = new ReplaceOptions(); diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java index d376a2018a7f..426097f4b91a 100644 --- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -38,7 +38,6 @@ abstract class StructuralSearchTestCase extends LightQuickFixTestCase { protected void setUp() throws Exception { super.setUp(); - StructuralSearchUtil.ourUseUniversalMatchingAlgorithm = false; testMatcher = new Matcher(getProject()); options = new MatchOptions(); options.setLooseMatching(true);