MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

get rid of guava Sets.new* (not required since java 7+)

Browse Source 
GitOrigin-RevId: 8eed42300cb24449371aede5076933d1df3fa700
This commit is contained in:
Vladimir Krivosheev
2020-06-12 15:41:46 +03:00
committed by intellij-monorepo-bot
parent eaefb91446
commit 4e37bbb536
24 changed files with 60 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/annotations/guava/com/google/common/collect/annotations.xml
+9
View File
@@ -15,4 +15,13 @@
name='com.google.common.collect.Lists java.util.concurrent.CopyOnWriteArrayList<E> newCopyOnWriteArrayList(java.lang.Iterable<? extends E>)'>
<annotation name='java.lang.Deprecated'/>
</item>
<item name='com.google.common.collect.Sets java.util.HashSet&lt;E&gt; newHashSet()'>
<annotation name='java.lang.Deprecated'/>
</item>
<item name='com.google.common.collect.Sets java.util.LinkedHashSet&lt;E&gt; newLinkedHashSet()'>
<annotation name='java.lang.Deprecated'/>
</item>
<item name='com.google.common.collect.Sets java.util.TreeSet&lt;E&gt; newTreeSet()'>
<annotation name='java.lang.Deprecated'/>
</item>
</root>
platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixLiveTemplate.java
+2 -3
View File
@@ -1,7 +1,6 @@
// 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-2020 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 com.intellij.codeInsight.template.postfix.templates;
import com.google.common.collect.Sets;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.completion.OffsetTranslator;
import com.intellij.codeInsight.template.CustomLiveTemplateBase;
@@ -47,7 +46,7 @@ public class PostfixLiveTemplate extends CustomLiveTemplateBase {
@NotNull
public Set<String> getAllTemplateKeys(PsiFile file, int offset) {
Set<String> keys = Sets.newHashSet();
Set<String> keys = new HashSet<String>();
Language language = PsiUtilCore.getLanguageAtOffset(file, offset);
for (PostfixTemplateProvider provider : LanguagePostfixTemplate.LANG_EP.allForLanguage(language)) {
ProgressManager.checkCanceled();
platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/GithubProjectGeneratorPeer.java
+2 -6
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2020 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 com.intellij.lang.javascript.boilerplate;
import com.google.common.collect.Sets;
import com.intellij.BundleBase;
import com.intellij.CommonBundle;
import com.intellij.ide.IdeBundle;
@@ -19,10 +18,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* @author Sergey Simonchik
@@ -71,7 +67,7 @@ public class GithubProjectGeneratorPeer implements WebProjectGenerator.Generator
return true;
}
int count = myComboBox.getItemCount();
Set<GithubTagInfo> oldTags = Sets.newHashSet();
Set<GithubTagInfo> oldTags = new HashSet<GithubTagInfo>();
for (int i = 1; i < count; i++) {
GithubTagInfo item = ObjectUtils.tryCast(myComboBox.getItemAt(i), GithubTagInfo.class);
if (item != null) {
platform/platform-impl/src/com/intellij/remote/RemoteSdkPropertiesHolder.java
+2 -2
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2020 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 com.intellij.remote;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.PathMappingSettings;
import org.jdom.Element;
@@ -9,6 +8,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
import java.util.TreeSet;
public class RemoteSdkPropertiesHolder implements RemoteSdkProperties {
private static final String INTERPRETER_PATH = "INTERPRETER_PATH";
@@ -29,7 +29,7 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties {
private boolean myHelpersVersionChecked = false;
private Set<String> myRemoteRoots = Sets.newTreeSet();
private Set<String> myRemoteRoots = new TreeSet<String>();
private boolean myInitialized = false;
python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
+1 -2
View File
@@ -4,7 +4,6 @@ package com.jetbrains.python.debugger.pydev;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.execution.ExecutionException;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -502,7 +501,7 @@ public class MultiProcessDebugger implements ProcessDebugger {
}
private Set<String> collectThreads(RemoteDebugger debugger) {
Set<String> result = Sets.newHashSet();
Set<String> result = new HashSet<String>();
for (Map.Entry<String, RemoteDebugger> entry : myMultiProcessDebugger.myThreadRegistry.myThreadIdToDebugger.entrySet()) {
if (entry.getValue() == debugger) {
result.add(entry.getKey());
python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyStructuralTypeAttributesCompletionContributor.java
+5 -8
View File
@@ -20,10 +20,7 @@ import com.jetbrains.python.psi.stubs.PyClassAttributesIndex;
import com.jetbrains.python.psi.types.*;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.*;
import static com.intellij.patterns.PlatformPatterns.psiElement;
import static com.jetbrains.python.psi.PyUtil.as;
@@ -103,7 +100,7 @@ public class PyStructuralTypeAttributesCompletionContributor extends CompletionC
private Set<PyClass> suggestClassesFromUsedAttributes(@NotNull PsiElement anchor,
@NotNull Set<String> seenAttrs,
@NotNull TypeEvalContext context) {
final Set<PyClass> candidates = Sets.newHashSet();
final Set<PyClass> candidates = new HashSet<PyClass>();
final Map<PyClass, Set<PyClass>> ancestorsCache = Maps.newHashMap();
for (String attribute : seenAttrs) {
// Search for some of these attributes like __init__ may produce thousands of candidates in average SDK
@@ -120,7 +117,7 @@ public class PyStructuralTypeAttributesCompletionContributor extends CompletionC
}
}
final Set<PyClass> suitableClasses = Sets.newHashSet();
final Set<PyClass> suitableClasses = new HashSet<PyClass>();
for (PyClass candidate : candidates) {
if (PyUserSkeletonsUtil.isUnderUserSkeletonsDirectory(candidate.getContainingFile())) {
continue;
@@ -162,7 +159,7 @@ public class PyStructuralTypeAttributesCompletionContributor extends CompletionC
}
// Sentinel value to prevent infinite recursion
ancestorsCache.put(pyClass, Collections.emptySet());
final Set<PyClass> result = Sets.newHashSet();
final Set<PyClass> result = new HashSet<PyClass>();
try {
for (final PyClassLikeType baseType : pyClass.getSuperClassTypes(context)) {
if (!(baseType instanceof PyClassType)) {
@@ -180,7 +177,7 @@ public class PyStructuralTypeAttributesCompletionContributor extends CompletionC
}
return result;
}
@NotNull
private static String debugClassCoordinates(PyClass cls) {
return cls.getQualifiedName() + " (" + cls.getContainingFile().getVirtualFile().getPath() + ")";
python/python-psi-impl/src/com/jetbrains/python/codeInsight/dataflow/scope/impl/ScopeImpl.java
+1 -2
View File
@@ -3,7 +3,6 @@
// found in the LICENSE file.
package com.jetbrains.python.codeInsight.dataflow.scope.impl;
import com.google.common.collect.Sets;
import com.intellij.codeInsight.controlflow.Instruction;
import com.intellij.codeInsight.dataflow.DFALimitExceededException;
import com.intellij.codeInsight.dataflow.map.DFAMap;
@@ -301,7 +300,7 @@ public class ScopeImpl implements Scope {
}
private void processNamedElement(@NotNull PsiNamedElement element) {
namedElements.computeIfAbsent(element.getName(), __ -> Sets.newLinkedHashSet()).add(element);
namedElements.computeIfAbsent(element.getName(), __ -> new LinkedHashSet<PsiNamedElement>()).add(element);
}
});
python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
+1 -2
View File
@@ -3,7 +3,6 @@ package com.jetbrains.python.codeInsight.typing;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.TextRange;
@@ -1363,7 +1362,7 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
@NotNull
public static Collection<String> resolveToQualifiedNames(@NotNull PyExpression expression, @NotNull TypeEvalContext context) {
final Set<String> names = Sets.newLinkedHashSet();
final Set<String> names = new LinkedHashSet<String>();
for (PsiElement resolved : tryResolving(expression, context)) {
final String name = getQualifiedName(resolved);
if (name != null) {
python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/PyDocstringGenerator.java
+3 -7
View File
@@ -17,7 +17,6 @@ package com.jetbrains.python.documentation.docstrings;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
@@ -32,10 +31,7 @@ import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
public class PyDocstringGenerator {
public static final String TRIPLE_DOUBLE_QUOTES = "\"\"\"";
@@ -221,7 +217,7 @@ public class PyDocstringGenerator {
if (myParametersPrepared) {
return;
}
final Set<Pair<String, Boolean>> withoutType = Sets.newHashSet();
final Set<Pair<String, Boolean>> withoutType = new HashSet<Pair<String, Boolean>>();
final Map<Pair<String, Boolean>, String> paramTypes = Maps.newHashMap();
for (DocstringParam param : myAddedParams) {
if (param.getType() == null) {
@@ -241,7 +237,7 @@ public class PyDocstringGenerator {
//}
final DocStringFormat format = myDocStringFormat;
final ArrayList<DocstringParam> filtered = new ArrayList<>();
final Set<Pair<String, Boolean>> processed = Sets.newHashSet();
final Set<Pair<String, Boolean>> processed = new HashSet<Pair<String, Boolean>>();
for (DocstringParam param : myAddedParams) {
final Pair<String, Boolean> paramCoordinates = Pair.create(param.getName(), param.isReturnValue());
if (processed.contains(paramCoordinates)) {
python/python-psi-impl/src/com/jetbrains/python/parsing/console/PythonConsoleData.java
+2 -3
View File
@@ -15,15 +15,14 @@
*/
package com.jetbrains.python.parsing.console;
import com.google.common.collect.Sets;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class PythonConsoleData {
private boolean myIPythonEnabled;
private boolean myIPythonAutomagic = true;
private final Set<String> myIPythonMagicCommands = Sets.newHashSet();
private final Set<String> myIPythonMagicCommands = new HashSet<String>();
private int myIndentSize = -1;
public boolean isIPythonEnabled() {
python/python-psi-impl/src/com/jetbrains/python/psi/impl/blockEvaluator/PyBlockEvaluator.java
+1 -2
View File
@@ -15,7 +15,6 @@
*/
package com.jetbrains.python.psi.impl.blockEvaluator;
import com.google.common.collect.Sets;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.QualifiedName;
@@ -49,7 +48,7 @@ public class PyBlockEvaluator {
* @see PyEvaluationContext
*/
public PyBlockEvaluator(@NotNull final PyEvaluationContext evaluationContext) {
this(Sets.newHashSet(), evaluationContext);
this(new HashSet<PyFile>(), evaluationContext);
}
/**
python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java
+2 -6
View File
@@ -2,7 +2,6 @@
package com.jetbrains.python.psi.types;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.roots.FileIndexFacade;
@@ -32,10 +31,7 @@ import com.jetbrains.python.psi.resolve.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Predicate;
import static com.jetbrains.python.psi.PyUtil.inSameFile;
@@ -151,7 +147,7 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
return;
}
final Set<String> seen = Sets.newHashSet();
final Set<String> seen = new HashSet<String>();
if (!processImplicitlyImportedByImportElements(anchor, footHold,
importElements, name -> filter.test(name) && seen.add(name),
resultProcessor)) {
python/python-psi-impl/src/com/jetbrains/python/refactoring/PyDefUseUtil.java
+1 -2
View File
@@ -15,7 +15,6 @@
*/
package com.jetbrains.python.refactoring;
import com.google.common.collect.Sets;
import com.intellij.codeInsight.controlflow.ControlFlow;
import com.intellij.codeInsight.controlflow.ControlFlowUtil;
import com.intellij.codeInsight.controlflow.Instruction;
@@ -121,7 +120,7 @@ public class PyDefUseUtil {
return PyElement.EMPTY_ARRAY;
}
final boolean[] visited = new boolean[instructions.length];
final Collection<PyElement> result = Sets.newHashSet();
final Collection<PyElement> result = new HashSet<PyElement>();
for (Instruction instruction : instructions[instr].allSucc()) {
getPostRefs(var, instructions, instruction.num(), visited, result);
}
python/python-sdk/src/com/jetbrains/python/sdk/PythonSdkAdditionalData.java
+2 -2
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2020 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 com.jetbrains.python.sdk;
import com.google.common.collect.Sets;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.projectRoots.Sdk;
@@ -21,6 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -148,7 +148,7 @@ public class PythonSdkAdditionalData implements SdkAdditionalData {
}
private static Set<VirtualFile> getPathsAsVirtualFiles(VirtualFilePointerContainer paths) {
Set<VirtualFile> ret = Sets.newHashSet();
Set<VirtualFile> ret = new HashSet<VirtualFile>();
Collections.addAll(ret, paths.getFiles());
return ret;
}
python/rest/src/com/jetbrains/rest/RestUtil.java
+4 -18
View File
@@ -1,23 +1,9 @@
/*
* Copyright 2000-2013 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-2020 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 com.jetbrains.rest;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -38,8 +24,8 @@ public class RestUtil {
};
public static final Set<String> PREDEFINED_ROLES = Sets.newHashSet();
public static final Set<String> SPHINX_ROLES = Sets.newHashSet();
public static final Set<String> PREDEFINED_ROLES = new HashSet<String>();
public static final Set<String> SPHINX_ROLES = new HashSet<String>();
private static final Map<String, String[]> DIRECTIVES = Maps.newHashMap();
static {
python/src/com/jetbrains/python/configuration/PythonPathEditor.java
+5 -4
View File
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -127,13 +128,13 @@ public class PythonPathEditor extends SdkPathEditor {
protected void onReloadButtonClicked() { }
private static class PathListModel {
private Set<VirtualFile> myAdded = Sets.newHashSet();
private Set<VirtualFile> myExcluded = Sets.newHashSet();
private final Set<VirtualFile> myFoundFiles = Sets.newHashSet();
private Set<VirtualFile> myAdded = new HashSet<VirtualFile>();
private Set<VirtualFile> myExcluded = new HashSet<VirtualFile>();
private final Set<VirtualFile> myFoundFiles = new HashSet<VirtualFile>();
private final List<VirtualFile> myFilteredOut = new ArrayList<>();
private final DefaultListModel<VirtualFile> myListModel;
private final OrderRootType myOrderRootType;
private final Set<VirtualFile> myUserAddedToRemove = Sets.newHashSet();
private final Set<VirtualFile> myUserAddedToRemove = new HashSet<VirtualFile>();
PathListModel(OrderRootType orderRootType, DefaultListModel<VirtualFile> listModel) {
myOrderRootType = orderRootType;
python/src/com/jetbrains/python/debugger/smartstepinto/PySmartStepIntoVariantVisitor.java
+3 -3
View File
@@ -3,7 +3,6 @@ package com.jetbrains.python.debugger.smartstepinto;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement;
import com.jetbrains.python.PyTokenTypes;
@@ -14,19 +13,20 @@ import com.jetbrains.python.pyi.PyiFile;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class PySmartStepIntoVariantVisitor extends PyRecursiveElementVisitor {
@NotNull @NonNls private static final ImmutableSet<String> BUILTINS_MODULES = ImmutableSet.of("builtins.py", "__builtin__.py");
int myVariantIndex = -1;
@NotNull private final List<PySmartStepIntoVariant> myCollector;
@NotNull private final List<Pair<String, Boolean>> myVariantsFromPython;
@NotNull private final PySmartStepIntoContext myContext;
@NotNull private final Map<String, Integer> mySeenVariants = Maps.newHashMap();
@NotNull private final Set<PsiElement> alreadyVisited = Sets.newHashSet();
@NotNull private final Set<PsiElement> alreadyVisited = new HashSet<PsiElement>();
public PySmartStepIntoVariantVisitor(@NotNull List<PySmartStepIntoVariant> collector,
@NotNull List<Pair<String, Boolean>> variantsFromPython,
python/src/com/jetbrains/python/run/PythonCommandLineState.java
+1 -1
View File
@@ -524,7 +524,7 @@ public abstract class PythonCommandLineState extends CommandLineState {
@NotNull
public static Collection<String> collectPythonPath(@Nullable Module module, boolean addContentRoots,
boolean addSourceRoots) {
Collection<String> pythonPathList = Sets.newLinkedHashSet();
Collection<String> pythonPathList = new LinkedHashSet<String>();
if (module != null) {
Set<Module> dependencies = new HashSet<>();
ModuleUtilCore.getDependencies(module, dependencies);
python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class PythonSdkUpdater implements StartupActivity.Background {
private static final Logger LOG = Logger.getInstance(PythonSdkUpdater.class);
private static final Object ourLock = new Object();
private static final Set<String> ourScheduledToRefresh = Sets.newHashSet();
private static final Set<String> ourScheduledToRefresh = new HashSet<String>();
private static final BlockingSet<String> ourUnderRefresh = new BlockingSet<>();
private static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.balloonGroup(
@@ -501,7 +501,7 @@ public class PythonSdkUpdater implements StartupActivity.Background {
*/
@NotNull
private static Set<Sdk> getPythonSdks(@NotNull Project project) {
final Set<Sdk> pythonSdks = Sets.newLinkedHashSet();
final Set<Sdk> pythonSdks = new LinkedHashSet<Sdk>();
for (Module module : ModuleManager.getInstance(project).getModules()) {
final Sdk sdk = PythonSdkUtil.findPythonSdk(module);
if (sdk != null && sdk.getSdkType() instanceof PythonSdkType) {
python/src/com/jetbrains/python/testing/PythonTestLegacyConfigurationProducer.java
+2 -3
View File
@@ -1,7 +1,6 @@
// 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-2020 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 com.jetbrains.python.testing;
import com.google.common.collect.Sets;
import com.intellij.execution.Location;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.configurations.ConfigurationFactory;
@@ -218,7 +217,7 @@ abstract public class PythonTestLegacyConfigurationProducer<T extends AbstractPy
protected boolean isTestFolder(@NotNull final VirtualFile virtualFile, @NotNull final Project project) {
@NonNls final String name = virtualFile.getName();
final HashSet<VirtualFile> roots = Sets.newHashSet();
final HashSet<VirtualFile> roots = new HashSet<VirtualFile>();
final Module[] modules = ModuleManager.getInstance(project).getModules();
for (Module module : modules) {
roots.addAll(PyUtil.getSourceRoots(module));
python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java
Vendored
+2 -6
View File
@@ -2,16 +2,12 @@
package com.jetbrains.env;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.UsefulTestCase;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.*;
import static com.intellij.testFramework.UsefulTestCase.assertEmpty;
@@ -24,7 +20,7 @@ public class PyEnvSufficiencyTest extends PyEnvTestCase {
if (UsefulTestCase.IS_UNDER_TEAMCITY && SETTINGS.isEnvConfiguration()) {
checkStaging();
Set<String> tags = Sets.newHashSet();
Set<String> tags = new HashSet<String>();
List<String> roots = getPythonRoots();
if (roots.size() == 0) {
return; // not on env agent
python/testSrc/com/jetbrains/env/PyTestTask.java
Vendored
+2 -2
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2020 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 com.jetbrains.env;
import com.google.common.collect.Sets;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.Ref;
@@ -10,6 +9,7 @@ import com.jetbrains.python.psi.LanguageLevel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
import java.util.Set;
public abstract class PyTestTask {
@@ -86,7 +86,7 @@ public abstract class PyTestTask {
*/
@NotNull
public Set<String> getTags() {
return Sets.newHashSet();
return new HashSet<String>();
}
/**
python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java
Vendored
+2 -2
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2020 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 com.jetbrains.env.python.debug;
import com.google.common.collect.Sets;
import com.intellij.execution.ExecutionResult;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
@@ -37,13 +36,14 @@ import org.junit.Assert;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
private final Set<Pair<String, Integer>> myBreakpoints = Sets.newHashSet();
private final Set<Pair<String, Integer>> myBreakpoints = new HashSet<Pair<String, Integer>>();
protected PyDebugProcess myDebugProcess;
protected XDebugSession mySession;
protected Semaphore myPausedSemaphore;
python/testSrc/com/jetbrains/env/python/testing/PyUnitTestLikeProcessWithConsoleTestTask.kt
Vendored
+3 -18
View File
@@ -1,21 +1,6 @@
/*
* 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-2020 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 com.jetbrains.env.python.testing
import com.google.common.collect.Sets
import com.jetbrains.env.PyProcessWithConsoleTestTask
import com.jetbrains.env.ut.PyScriptTestProcessRunner
import com.jetbrains.env.ut.PyUnitTestProcessRunner
@@ -35,8 +20,8 @@ PyScriptTestProcessRunner<*>> @JvmOverloads constructor(relativePathToTestData:
protected val processRunnerCreator: Function<TestRunnerConfig, T>) :
PyProcessWithConsoleTestTask<T>(relativePathToTestData, SdkCreationType.SDK_PACKAGES_ONLY) {
override fun getTagsToCover(): Set<String> = Sets.newHashSet("python2.6", "python2.7", "python3.5", "python3.6", "jython", "pypy",
"IronPython")
override fun getTagsToCover(): Set<String> = hashSetOf("python2.6", "python2.7", "python3.5", "python3.6", "jython", "pypy",
"IronPython")
@Throws(Exception::class)