Introduced intellij.python.community.testFramework instead of depending on intellij.python.tools

Module intellij.python.tools depends explicitly on PyCharm Community which leads to errors when
you try to run Python Community tests in the context of any other IDE. This commit introduces
a testFramework module for Python that now contains code from intellij.python.tools necessary
for running tests.

GitOrigin-RevId: 9789469edc396a8b0f7408d453017a5b4e1eebc2
This commit is contained in:
Andrey Vlasovskikh
2019-11-18 19:07:46 +00:00
committed by intellij-monorepo-bot
parent 543ca840b7
commit d055d648b2
8 changed files with 20 additions and 24 deletions
+1
View File
@@ -709,6 +709,7 @@
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.main.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.iml" filepath="$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.tests.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/python/testFramework/intellij.python.community.testFramework.iml" filepath="$PROJECT_DIR$/python/testFramework/intellij.python.community.testFramework.iml" />
<module fileurl="file://$PROJECT_DIR$/python/testSrc/intellij.python.community.tests.iml" filepath="$PROJECT_DIR$/python/testSrc/intellij.python.community.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/python/python-copyright/intellij.python.copyright.iml" filepath="$PROJECT_DIR$/python/python-copyright/intellij.python.copyright.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.helpers.iml" filepath="$PROJECT_DIR$/python/intellij.python.helpers.iml" />
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.testFramework" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.tools.index" />
</component>
</module>
@@ -1,18 +1,4 @@
/*
* 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.
* 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-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.
package com.jetbrains.python.tools
import com.intellij.openapi.application.impl.ApplicationInfoImpl
@@ -21,14 +21,16 @@
<orderEntry type="library" scope="TEST" name="easymock" level="project" />
<orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
<orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.python.tools" scope="TEST" />
<orderEntry type="library" name="XmlRPC" level="project" />
<orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
<orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
<orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.copyright" scope="TEST" />
<orderEntry type="module" module-name="intellij.python.copyright" scope="TEST" />
<orderEntry type="module" module-name="intellij.python.community.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.python.psi.impl" />
<orderEntry type="module" module-name="intellij.python.community.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharm.community" scope="RUNTIME" />
</component>
</module>
+1
View File
@@ -20,5 +20,6 @@
<orderEntry type="module" module-name="intellij.pycharm.community.build" />
<orderEntry type="library" scope="PROVIDED" name="Ant" level="project" />
<orderEntry type="module" module-name="intellij.python.community.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.testFramework" />
</component>
</module>
@@ -1,8 +0,0 @@
// 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.
/**
* Engine to create SDK in tests.
* See {@link com.jetbrains.python.tools.sdkTools.PySdkTools}
* @author Ilya.Kazakevich
*/
package com.jetbrains.python.tools.sdkTools;