MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[test framework] moves non-bundled dependencies out of the framework

Browse Source
This commit is contained in:
Roman Shevchenko
2016-12-05 18:05:14 +01:00
parent 9a8d326ccb
commit 5f41df1118
17 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/modules.xml generated
View File

@@ -263,6 +263,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/tasks/tasks-java/tasks-java.iml" filepath="$PROJECT_DIR$/plugins/tasks/tasks-java/tasks-java.iml" group="plugins/tasks" />
<module fileurl="file://$PROJECT_DIR$/plugins/tasks/tasks-tests/tasks-tests.iml" filepath="$PROJECT_DIR$/plugins/tasks/tasks-tests/tasks-tests.iml" group="plugins/tasks" />
<module fileurl="file://$PROJECT_DIR$/plugins/terminal/terminal.iml" filepath="$PROJECT_DIR$/plugins/terminal/terminal.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/platform/testFramework/extensions/testExtensions.iml" filepath="$PROJECT_DIR$/platform/testFramework/extensions/testExtensions.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/testFramework/testFramework.iml" filepath="$PROJECT_DIR$/platform/testFramework/testFramework.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/java/testFramework/testFramework-java.iml" filepath="$PROJECT_DIR$/java/testFramework/testFramework-java.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/platform/testRunner/testRunner.iml" filepath="$PROJECT_DIR$/platform/testRunner/testRunner.iml" group="platform" />

1
java/java-tests/java-tests.iml
View File

@@ -56,5 +56,6 @@
<orderEntry type="module" module-name="configuration-store-impl" scope="TEST" />
<orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
<orderEntry type="module" module-name="configuration-store-tests" scope="TEST" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

2
java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionSchemeTest.kt
View File

@@ -17,7 +17,7 @@ package com.intellij.codeInspection.ex
import com.intellij.configurationStore.SchemeManagerFactoryBase
import com.intellij.openapi.application.ApplicationManager
import com.intellij.testFramework.InMemoryFsRule
import com.intellij.testFramework.rules.InMemoryFsRule
import com.intellij.testFramework.ProjectRule
import com.intellij.testFramework.runInInitMode
import com.intellij.util.io.readText

2
platform/configuration-store-impl/testSrc/TemplateSchemeTest.kt
View File

@@ -1,7 +1,7 @@
package com.intellij.configurationStore
import com.intellij.codeInsight.template.impl.TemplateSettings
import com.intellij.testFramework.InMemoryFsRule
import com.intellij.testFramework.rules.InMemoryFsRule
import com.intellij.testFramework.ProjectRule
import com.intellij.util.io.readText
import com.intellij.util.io.write

1
platform/configuration-store-impl/testSrc/configuration-store-tests.iml
View File

@@ -18,5 +18,6 @@
<orderEntry type="module" module-name="eclipse" scope="TEST" />
<orderEntry type="module" module-name="configuration-store-impl" />
<orderEntry type="module" module-name="util-tests" scope="TEST" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

1
platform/credential-store/credential-store.iml
View File

@@ -19,5 +19,6 @@
<orderEntry type="library" name="bouncy-castle-provider" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="module" module-name="projectModel-impl" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

1
platform/platform-tests/platform-tests.iml
View File

@@ -31,5 +31,6 @@
<orderEntry type="library" scope="TEST" name="KotlinTest" level="project" />
<orderEntry type="library" scope="RUNTIME" name="purejavacomm" level="project" />
<orderEntry type="module" module-name="configuration-store-impl" scope="TEST" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

2
platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/EditorColorSchemeTest.kt
View File

@@ -19,7 +19,7 @@ import com.intellij.configurationStore.SchemeManagerFactoryBase
import com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager
import com.intellij.openapi.editor.colors.impl.AbstractColorsScheme
import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl
import com.intellij.testFramework.InMemoryFsRule
import com.intellij.testFramework.rules.InMemoryFsRule
import com.intellij.testFramework.ProjectRule
import com.intellij.util.io.readText
import com.intellij.util.io.write

0
platform/testFramework/src/com/intellij/testFramework/assertions/Assertions.java → platform/testFramework/extensions/src/com/intellij/testFramework/assertions/Assertions.java
View File

0
platform/testFramework/src/com/intellij/testFramework/assertions/JdomAssert.kt → platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt
View File

0
platform/testFramework/src/com/intellij/testFramework/assertions/PathAssertEx.kt → platform/testFramework/extensions/src/com/intellij/testFramework/assertions/PathAssertEx.kt
View File

2
platform/testFramework/src/com/intellij/testFramework/InMemoryFsRule.kt → platform/testFramework/extensions/src/com/intellij/testFramework/rules/InMemoryFsRule.kt
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.testFramework
package com.intellij.testFramework.rules
import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder
import org.junit.rules.ExternalResource

17
platform/testFramework/extensions/testExtensions.iml Normal file
View File

@@ -0,0 +1,17 @@
<?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="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
<orderEntry type="module" module-name="util" scope="TEST" />
<orderEntry type="module" module-name="testFramework" scope="TEST" />
<orderEntry type="library" exported="" scope="TEST" name="JDOM" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
</component>
</module>

2
platform/testFramework/testFramework.iml
View File

@@ -25,8 +25,6 @@
<orderEntry type="module" module-name="images" exported="" scope="RUNTIME" />
<orderEntry type="module" module-name="RegExpSupport" exported="" scope="RUNTIME" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" exported="" name="assertJ" level="project" />
<orderEntry type="library" name="memoryfilesystem" level="project" />
<orderEntry type="module" module-name="boot" />
</component>
</module>

1
plugins/eclipse/eclipse.iml
View File

@@ -22,5 +22,6 @@
<orderEntry type="module" module-name="java-impl" />
<orderEntry type="module" module-name="eclipse-jps-plugin" />
<orderEntry type="module" module-name="common-eclipse-util" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

1
plugins/settings-repository/settings-repository-tests.iml
View File

@@ -25,5 +25,6 @@
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
<orderEntry type="module" module-name="credential-store" scope="TEST" />
<orderEntry type="module" module-name="testExtensions" scope="TEST" />
</component>
</module>

2
plugins/settings-repository/testSrc/IcsTestCase.kt
View File

@@ -15,7 +15,7 @@
*/
package org.jetbrains.settingsRepository.test
import com.intellij.testFramework.InMemoryFsRule
import com.intellij.testFramework.rules.InMemoryFsRule
import com.intellij.testFramework.TemporaryDirectory
import com.intellij.util.io.writeChild
import org.eclipse.jgit.lib.Repository