diff --git a/python/testSrc/com/jetbrains/env/community/PyEnvSufficiencyTest.java b/python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java similarity index 97% rename from python/testSrc/com/jetbrains/env/community/PyEnvSufficiencyTest.java rename to python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java index 61b64dfee5bf..83846a1bb5f5 100644 --- a/python/testSrc/com/jetbrains/env/community/PyEnvSufficiencyTest.java +++ b/python/testSrc/com/jetbrains/env/PyEnvSufficiencyTest.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community; +package com.jetbrains.env; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/python/testSrc/com/jetbrains/env/community/PyEnvTaskRunner.java b/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java similarity index 98% rename from python/testSrc/com/jetbrains/env/community/PyEnvTaskRunner.java rename to python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java index aab5f969da28..baabd5a5e5e1 100644 --- a/python/testSrc/com/jetbrains/env/community/PyEnvTaskRunner.java +++ b/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community; +package com.jetbrains.env; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/python/testSrc/com/jetbrains/env/community/PyEnvTestCase.java b/python/testSrc/com/jetbrains/env/PyEnvTestCase.java similarity index 99% rename from python/testSrc/com/jetbrains/env/community/PyEnvTestCase.java rename to python/testSrc/com/jetbrains/env/PyEnvTestCase.java index 5f07b29a1639..853a5504de63 100644 --- a/python/testSrc/com/jetbrains/env/community/PyEnvTestCase.java +++ b/python/testSrc/com/jetbrains/env/PyEnvTestCase.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community; +package com.jetbrains.env; import com.google.common.collect.Lists; import com.intellij.openapi.application.ApplicationManager; diff --git a/python/testSrc/com/jetbrains/env/community/PyExecutionFixtureTestTask.java b/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java similarity index 99% rename from python/testSrc/com/jetbrains/env/community/PyExecutionFixtureTestTask.java rename to python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java index 2c48c1b6da8f..f42fd9721c67 100644 --- a/python/testSrc/com/jetbrains/env/community/PyExecutionFixtureTestTask.java +++ b/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community; +package com.jetbrains.env; import com.google.common.collect.Lists; import com.intellij.execution.process.ProcessHandler; diff --git a/python/testSrc/com/jetbrains/env/community/PyTestTask.java b/python/testSrc/com/jetbrains/env/PyTestTask.java similarity index 97% rename from python/testSrc/com/jetbrains/env/community/PyTestTask.java rename to python/testSrc/com/jetbrains/env/PyTestTask.java index 61e81d08110d..bfc1a688ebfa 100644 --- a/python/testSrc/com/jetbrains/env/community/PyTestTask.java +++ b/python/testSrc/com/jetbrains/env/PyTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community; +package com.jetbrains.env; import com.google.common.collect.Sets; import com.intellij.openapi.util.io.FileUtil; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoEnvTestTask.java b/python/testSrc/com/jetbrains/env/django/DjangoEnvTestTask.java index 7755b840080a..7e87e9fd8cb2 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoEnvTestTask.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoEnvTestTask.java @@ -9,7 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; import com.jetbrains.django.facet.DjangoFacet; import com.jetbrains.django.fixtures.DjangoTestCase; -import com.jetbrains.env.community.python.debug.PyDebuggerTask; +import com.jetbrains.env.python.debug.PyDebuggerTask; import com.jetbrains.python.fixtures.PyProfessionalTestCase; import com.jetbrains.python.templateLanguages.TemplatesService; import org.junit.Assert; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoManageTaskActionsTest.java b/python/testSrc/com/jetbrains/env/django/DjangoManageTaskActionsTest.java index cc3b4c17c748..ca3f2c23fd18 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoManageTaskActionsTest.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoManageTaskActionsTest.java @@ -7,7 +7,7 @@ import com.jetbrains.django.actions.manage.ManageTaskActions; import com.jetbrains.django.manage.BaseCommand; import com.jetbrains.django.testRunner.DjangoTestsConfigurationType; import com.jetbrains.django.util.DjangoUtil; -import com.jetbrains.env.community.PyEnvTestCase; +import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.python.run.AbstractPythonRunConfiguration; import org.jetbrains.annotations.Nullable; import org.junit.Assert; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoManageTestTask.java b/python/testSrc/com/jetbrains/env/django/DjangoManageTestTask.java index 446939b9ec7e..f476ac99aadb 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoManageTestTask.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoManageTestTask.java @@ -29,7 +29,7 @@ import com.jetbrains.django.fixtures.DjangoTestCase; import com.jetbrains.django.manage.DjangoManageTask; import com.jetbrains.django.testRunner.DjangoTestsConfigurationType; import com.jetbrains.django.ui.DjangoBundle; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.run.AbstractPythonRunConfiguration; import com.jetbrains.python.run.PythonTracebackFilter; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoPathTest.java b/python/testSrc/com/jetbrains/env/django/DjangoPathTest.java index b60af2d9db13..c98d26f9ca60 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoPathTest.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoPathTest.java @@ -5,7 +5,7 @@ import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.openapi.util.io.FileUtil; import com.jetbrains.django.run.DjangoServerRunConfiguration; import com.jetbrains.django.run.DjangoServerRunConfigurationType; -import com.jetbrains.env.community.PyEnvTestCase; +import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.python.run.AbstractPythonRunConfiguration; import junit.framework.Assert; import org.jetbrains.annotations.Nullable; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoProjectCreationTest.java b/python/testSrc/com/jetbrains/env/django/DjangoProjectCreationTest.java index 59143a0e7b37..7d977dc9cebd 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoProjectCreationTest.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoProjectCreationTest.java @@ -13,8 +13,8 @@ import com.intellij.testFramework.UsefulTestCase; import com.jetbrains.django.DjangoNames; import com.jetbrains.django.model.DjangoAdmin; import com.jetbrains.django.util.DjangoUtil; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.psi.PyFile; import com.jetbrains.python.psi.PyUtil; import com.jetbrains.python.psi.impl.blockEvaluator.PyBlockEvaluator; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoTemplateDebuggerTest.java b/python/testSrc/com/jetbrains/env/django/DjangoTemplateDebuggerTest.java index bf1f98f76726..1cda9ed3a533 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoTemplateDebuggerTest.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoTemplateDebuggerTest.java @@ -4,7 +4,7 @@ import com.google.common.collect.Sets; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.xdebugger.XDebuggerTestUtil; import com.jetbrains.django.util.VirtualFileUtil; -import com.jetbrains.env.community.PyEnvTestCase; +import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.python.debugger.django.DjangoExceptionBreakpointProperties; import com.jetbrains.python.debugger.django.DjangoExceptionBreakpointType; diff --git a/python/testSrc/com/jetbrains/env/django/DjangoTestRunnerTest.java b/python/testSrc/com/jetbrains/env/django/DjangoTestRunnerTest.java index 28c23802c3a7..9be764dd6eb6 100644 --- a/python/testSrc/com/jetbrains/env/django/DjangoTestRunnerTest.java +++ b/python/testSrc/com/jetbrains/env/django/DjangoTestRunnerTest.java @@ -9,7 +9,7 @@ import com.jetbrains.django.facet.DjangoFacet; import com.jetbrains.django.facet.DjangoFacetConfiguration; import com.jetbrains.django.testRunner.DjangoTestsConfigurationType; import com.jetbrains.django.testRunner.DjangoTestsRunConfiguration; -import com.jetbrains.env.community.PyEnvTestCase; +import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.python.packaging.PyExternalProcessException; import com.jetbrains.python.packaging.PyPackage; import com.jetbrains.python.packaging.PyPackageManager; diff --git a/python/testSrc/com/jetbrains/env/community/python/IPythonConsoleTest.java b/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java similarity index 94% rename from python/testSrc/com/jetbrains/env/community/python/IPythonConsoleTest.java rename to python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java index a67503e8d586..a039344451d4 100644 --- a/python/testSrc/com/jetbrains/env/community/python/IPythonConsoleTest.java +++ b/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -8,8 +8,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiErrorElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.python.console.PyConsoleTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.python.console.PyConsoleTask; import org.hamcrest.Matchers; import org.jetbrains.annotations.NotNull; import org.junit.Assert; diff --git a/python/testSrc/com/jetbrains/env/community/python/PyPackageRequirementsInspectionTest.java b/python/testSrc/com/jetbrains/env/python/PyPackageRequirementsInspectionTest.java similarity index 94% rename from python/testSrc/com/jetbrains/env/community/python/PyPackageRequirementsInspectionTest.java rename to python/testSrc/com/jetbrains/env/python/PyPackageRequirementsInspectionTest.java index cda73ca8b50d..8e3b75dd56a0 100644 --- a/python/testSrc/com/jetbrains/env/community/python/PyPackageRequirementsInspectionTest.java +++ b/python/testSrc/com/jetbrains/env/python/PyPackageRequirementsInspectionTest.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; import com.google.common.collect.ImmutableSet; import com.intellij.openapi.module.Module; @@ -6,8 +6,8 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.PsiTestUtil; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.PythonTestUtil; import com.jetbrains.python.inspections.PyPackageRequirementsInspection; import com.jetbrains.python.sdkTools.SdkCreationType; diff --git a/python/testSrc/com/jetbrains/env/community/python/PyPackagingTest.java b/python/testSrc/com/jetbrains/env/python/PyPackagingTest.java similarity index 97% rename from python/testSrc/com/jetbrains/env/community/python/PyPackagingTest.java rename to python/testSrc/com/jetbrains/env/python/PyPackagingTest.java index c8e1197b2ba5..54afb702322b 100644 --- a/python/testSrc/com/jetbrains/env/community/python/PyPackagingTest.java +++ b/python/testSrc/com/jetbrains/env/python/PyPackagingTest.java @@ -1,13 +1,13 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; import com.google.common.collect.Sets; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.UsefulTestCase; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; -import com.jetbrains.env.community.PyTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyTestTask; import com.jetbrains.python.packaging.*; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.sdk.PythonSdkType; diff --git a/python/testSrc/com/jetbrains/env/community/python/PythonConsoleTest.java b/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java similarity index 95% rename from python/testSrc/com/jetbrains/env/community/python/PythonConsoleTest.java rename to python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java index 534dd13e7653..4134b1697851 100644 --- a/python/testSrc/com/jetbrains/env/community/python/PythonConsoleTest.java +++ b/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java @@ -1,8 +1,8 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; import com.google.common.collect.Sets; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.python.console.PyConsoleTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.python.console.PyConsoleTask; import org.junit.Assert; import java.util.Collections; diff --git a/python/testSrc/com/jetbrains/env/community/python/PythonDebuggerTest.java b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java similarity index 98% rename from python/testSrc/com/jetbrains/env/community/python/PythonDebuggerTest.java rename to python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java index 9db598652821..4372715371eb 100644 --- a/python/testSrc/com/jetbrains/env/community/python/PythonDebuggerTest.java +++ b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java @@ -1,13 +1,13 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.xdebugger.XDebuggerTestUtil; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.python.debug.PyDebuggerTask; -import com.jetbrains.env.community.ut.PyUnitTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.python.debug.PyDebuggerTask; +import com.jetbrains.env.ut.PyUnitTestTask; import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.console.pydev.PydevCompletionVariant; import com.jetbrains.python.debugger.PyDebuggerException; diff --git a/python/testSrc/com/jetbrains/env/community/python/PythonGeneratorTest.java b/python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java similarity index 75% rename from python/testSrc/com/jetbrains/env/community/python/PythonGeneratorTest.java rename to python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java index f28344ea834d..273cb3f94011 100644 --- a/python/testSrc/com/jetbrains/env/community/python/PythonGeneratorTest.java +++ b/python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java @@ -1,7 +1,7 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.ut.PyUnitTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.ut.PyUnitTestTask; import com.jetbrains.python.PythonHelpersLocator; /** diff --git a/python/testSrc/com/jetbrains/env/community/python/PythonSkeletonsTest.java b/python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java similarity index 97% rename from python/testSrc/com/jetbrains/env/community/python/PythonSkeletonsTest.java rename to python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java index de34949aca58..c6b150f31359 100644 --- a/python/testSrc/com/jetbrains/env/community/python/PythonSkeletonsTest.java +++ b/python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python; +package com.jetbrains.env.python; import com.google.common.collect.ImmutableSet; import com.intellij.openapi.application.ApplicationManager; @@ -9,9 +9,9 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; -import com.jetbrains.env.community.PyTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyTestTask; import com.jetbrains.python.PythonFileType; import com.jetbrains.python.PythonTestUtil; import com.jetbrains.python.documentation.PythonDocumentationProvider; diff --git a/python/testSrc/com/jetbrains/env/community/python/console/PyConsoleTask.java b/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java similarity index 98% rename from python/testSrc/com/jetbrains/env/community/python/console/PyConsoleTask.java rename to python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java index d43ce0a10232..9a242934042d 100644 --- a/python/testSrc/com/jetbrains/env/community/python/console/PyConsoleTask.java +++ b/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python.console; +package com.jetbrains.env.python.console; import com.google.common.collect.Lists; import com.intellij.execution.console.LanguageConsoleView; @@ -13,7 +13,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.frame.XValueChildrenList; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.console.*; import com.jetbrains.python.console.pydev.ConsoleCommunicationListener; import com.jetbrains.python.debugger.PyDebugValue; diff --git a/python/testSrc/com/jetbrains/env/community/python/debug/PyBaseDebuggerTask.java b/python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java similarity index 98% rename from python/testSrc/com/jetbrains/env/community/python/debug/PyBaseDebuggerTask.java rename to python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java index b3426fc24b54..4cbe159f7cc7 100644 --- a/python/testSrc/com/jetbrains/env/community/python/debug/PyBaseDebuggerTask.java +++ b/python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python.debug; +package com.jetbrains.env.python.debug; import com.google.common.collect.Sets; import com.intellij.openapi.application.Result; @@ -12,7 +12,7 @@ import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.*; import com.intellij.xdebugger.frame.XValue; import com.jetbrains.django.util.VirtualFileUtil; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.console.PythonDebugLanguageConsoleView; import com.jetbrains.python.debugger.PyDebugProcess; import com.jetbrains.python.debugger.PyDebugValue; diff --git a/python/testSrc/com/jetbrains/env/community/python/debug/PyDebuggerTask.java b/python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java similarity index 99% rename from python/testSrc/com/jetbrains/env/community/python/debug/PyDebuggerTask.java rename to python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java index d2923f34a3ad..7de13d1ebed6 100644 --- a/python/testSrc/com/jetbrains/env/community/python/debug/PyDebuggerTask.java +++ b/python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python.debug; +package com.jetbrains.env.python.debug; import com.intellij.execution.*; import com.intellij.execution.configurations.ConfigurationFactory; diff --git a/python/testSrc/com/jetbrains/env/community/python/dotNet/PyIronPythonTest.java b/python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java similarity index 97% rename from python/testSrc/com/jetbrains/env/community/python/dotNet/PyIronPythonTest.java rename to python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java index 70f9b2453419..a6f9dd68971d 100644 --- a/python/testSrc/com/jetbrains/env/community/python/dotNet/PyIronPythonTest.java +++ b/python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java @@ -1,8 +1,8 @@ -package com.jetbrains.env.community.python.dotNet; +package com.jetbrains.env.python.dotNet; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.Result; -import com.jetbrains.env.community.PyEnvTestCase; +import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.python.psi.PyFile; import org.jetbrains.annotations.NotNull; import org.junit.Assert; diff --git a/python/testSrc/com/jetbrains/env/community/python/dotNet/SkeletonTestTask.java b/python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java similarity index 98% rename from python/testSrc/com/jetbrains/env/community/python/dotNet/SkeletonTestTask.java rename to python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java index f2b788b82848..e10916cbe7de 100644 --- a/python/testSrc/com/jetbrains/env/community/python/dotNet/SkeletonTestTask.java +++ b/python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.python.dotNet; +package com.jetbrains.env.python.dotNet; import com.google.common.collect.Sets; import com.intellij.codeInsight.intention.IntentionAction; @@ -11,7 +11,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.util.ui.UIUtil; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.PyBundle; import com.jetbrains.python.PyNames; import com.jetbrains.python.inspections.quickfix.GenerateBinaryStubsFix; diff --git a/python/testSrc/com/jetbrains/env/community/python/dotNet/package-info.java b/python/testSrc/com/jetbrains/env/python/dotNet/package-info.java similarity index 79% rename from python/testSrc/com/jetbrains/env/community/python/dotNet/package-info.java rename to python/testSrc/com/jetbrains/env/python/dotNet/package-info.java index 9facb61f3be3..e56e6203b98d 100644 --- a/python/testSrc/com/jetbrains/env/community/python/dotNet/package-info.java +++ b/python/testSrc/com/jetbrains/env/python/dotNet/package-info.java @@ -2,4 +2,4 @@ * IronPython tests. Install IronPython, .NET and add "iron" to "tags.txt" file. Check for more info: http://confluence.jetbrains.com/display/PYINT/Env+Tests * @author Ilya.Kazakevich */ -package com.jetbrains.env.community.python.dotNet; \ No newline at end of file +package com.jetbrains.env.python.dotNet; \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/env/community/python/testing/PythonDocTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java similarity index 90% rename from python/testSrc/com/jetbrains/env/community/python/testing/PythonDocTestingTest.java rename to python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java index 178673fa30c3..411b6049350a 100644 --- a/python/testSrc/com/jetbrains/env/community/python/testing/PythonDocTestingTest.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java @@ -1,7 +1,7 @@ -package com.jetbrains.env.community.python.testing; +package com.jetbrains.env.python.testing; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.ut.PyDocTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.ut.PyDocTestTask; /** * User : catherine diff --git a/python/testSrc/com/jetbrains/env/community/python/testing/PythonNoseTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java similarity index 81% rename from python/testSrc/com/jetbrains/env/community/python/testing/PythonNoseTestingTest.java rename to python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java index 7bc3d438e9db..33250ae17fa4 100644 --- a/python/testSrc/com/jetbrains/env/community/python/testing/PythonNoseTestingTest.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java @@ -1,7 +1,7 @@ -package com.jetbrains.env.community.python.testing; +package com.jetbrains.env.python.testing; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.ut.PyNoseTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.ut.PyNoseTestTask; /** * User : catherine diff --git a/python/testSrc/com/jetbrains/env/community/python/testing/PythonPyTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java similarity index 81% rename from python/testSrc/com/jetbrains/env/community/python/testing/PythonPyTestingTest.java rename to python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java index 94463b89ae27..ab3dee60c5b0 100644 --- a/python/testSrc/com/jetbrains/env/community/python/testing/PythonPyTestingTest.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java @@ -1,7 +1,7 @@ -package com.jetbrains.env.community.python.testing; +package com.jetbrains.env.python.testing; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.ut.PyTestTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.ut.PyTestTestTask; /** * User : catherine diff --git a/python/testSrc/com/jetbrains/env/community/python/testing/PythonUnitTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java similarity index 92% rename from python/testSrc/com/jetbrains/env/community/python/testing/PythonUnitTestingTest.java rename to python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java index 892db6c8bdee..682eb8160285 100644 --- a/python/testSrc/com/jetbrains/env/community/python/testing/PythonUnitTestingTest.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java @@ -1,7 +1,7 @@ -package com.jetbrains.env.community.python.testing; +package com.jetbrains.env.python.testing; -import com.jetbrains.env.community.PyEnvTestCase; -import com.jetbrains.env.community.ut.PyUnitTestTask; +import com.jetbrains.env.PyEnvTestCase; +import com.jetbrains.env.ut.PyUnitTestTask; import junit.framework.Assert; /** diff --git a/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTask.java b/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTask.java index 7921c029fca4..844dd61e02a0 100644 --- a/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTask.java +++ b/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTask.java @@ -15,7 +15,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.*; -import com.jetbrains.env.community.python.debug.PyBaseDebuggerTask; +import com.jetbrains.env.python.debug.PyBaseDebuggerTask; import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.debugger.remote.*; import com.jetbrains.python.debugger.remote.vfs.PyRemotePositionConverter; diff --git a/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTest.java b/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTest.java index 0952a175bc75..c76bb26e1e65 100644 --- a/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTest.java +++ b/python/testSrc/com/jetbrains/env/remote/PyRemoteDebuggerTest.java @@ -5,10 +5,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.util.ui.UIUtil; -import com.jetbrains.env.community.PyEnvTaskRunner; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; -import com.jetbrains.env.community.PyTestTask; -import com.jetbrains.env.community.python.PythonDebuggerTest; +import com.jetbrains.env.PyEnvTaskRunner; +import com.jetbrains.env.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyTestTask; +import com.jetbrains.env.python.PythonDebuggerTest; import com.jetbrains.python.remote.PyRemoteSdkAdditionalData; import org.jetbrains.annotations.Nullable; diff --git a/python/testSrc/com/jetbrains/env/remote/PyTestRemoteSdkProvider.java b/python/testSrc/com/jetbrains/env/remote/PyTestRemoteSdkProvider.java index 53798308c072..743082c9bfba 100644 --- a/python/testSrc/com/jetbrains/env/remote/PyTestRemoteSdkProvider.java +++ b/python/testSrc/com/jetbrains/env/remote/PyTestRemoteSdkProvider.java @@ -14,7 +14,7 @@ import com.intellij.remote.RemoteCredentialsHolder; import com.intellij.remote.RemoteSdkException; import com.intellij.testFramework.UsefulTestCase; import com.intellij.util.ui.UIUtil; -import com.jetbrains.env.community.PyTestTask; +import com.jetbrains.env.PyTestTask; import com.jetbrains.python.remote.PyRemoteInterpreterManagerImpl; import com.jetbrains.python.remote.PyRemoteSdkAdditionalData; import org.jetbrains.annotations.NotNull; diff --git a/python/testSrc/com/jetbrains/env/community/ut/PyDocTestTask.java b/python/testSrc/com/jetbrains/env/ut/PyDocTestTask.java similarity index 95% rename from python/testSrc/com/jetbrains/env/community/ut/PyDocTestTask.java rename to python/testSrc/com/jetbrains/env/ut/PyDocTestTask.java index bfc62fa55a38..e8228d767287 100644 --- a/python/testSrc/com/jetbrains/env/community/ut/PyDocTestTask.java +++ b/python/testSrc/com/jetbrains/env/ut/PyDocTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.ut; +package com.jetbrains.env.ut; import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.openapi.project.Project; diff --git a/python/testSrc/com/jetbrains/env/community/ut/PyNoseTestTask.java b/python/testSrc/com/jetbrains/env/ut/PyNoseTestTask.java similarity index 95% rename from python/testSrc/com/jetbrains/env/community/ut/PyNoseTestTask.java rename to python/testSrc/com/jetbrains/env/ut/PyNoseTestTask.java index 7d26d96c3eca..e130dd5717a4 100644 --- a/python/testSrc/com/jetbrains/env/community/ut/PyNoseTestTask.java +++ b/python/testSrc/com/jetbrains/env/ut/PyNoseTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.ut; +package com.jetbrains.env.ut; import com.google.common.collect.ImmutableSet; import com.intellij.execution.configurations.ConfigurationFactory; diff --git a/python/testSrc/com/jetbrains/env/community/ut/PyTestTestTask.java b/python/testSrc/com/jetbrains/env/ut/PyTestTestTask.java similarity index 96% rename from python/testSrc/com/jetbrains/env/community/ut/PyTestTestTask.java rename to python/testSrc/com/jetbrains/env/ut/PyTestTestTask.java index e80d40aa7326..1e4261188206 100644 --- a/python/testSrc/com/jetbrains/env/community/ut/PyTestTestTask.java +++ b/python/testSrc/com/jetbrains/env/ut/PyTestTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.ut; +package com.jetbrains.env.ut; import com.google.common.collect.ImmutableSet; import com.intellij.execution.configurations.ConfigurationFactory; diff --git a/python/testSrc/com/jetbrains/env/community/ut/PyUnitTestTask.java b/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java similarity index 98% rename from python/testSrc/com/jetbrains/env/community/ut/PyUnitTestTask.java rename to python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java index ce441dd46961..2a2edc97a404 100644 --- a/python/testSrc/com/jetbrains/env/community/ut/PyUnitTestTask.java +++ b/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java @@ -1,4 +1,4 @@ -package com.jetbrains.env.community.ut; +package com.jetbrains.env.ut; import com.google.common.collect.Lists; import com.intellij.execution.*; @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.XDebuggerTestUtil; -import com.jetbrains.env.community.PyExecutionFixtureTestTask; +import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.python.sdk.PythonEnvUtil; import com.jetbrains.python.sdk.flavors.JythonSdkFlavor; import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;