azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix access from tests to internal elements in production code in case of circular dependency

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-11-09 15:42:16 +03:00
parent a8b11ff07b
commit 5b59fc74bc
28 changed files with 292 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr
Vendored
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
<component name="CopyrightManager" default="">
<module2copyright />
</component>
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
<module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
</component>
</project>
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml
Vendored
+15
View File
@@ -0,0 +1,15 @@
<?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" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="module2" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
fun a() {
}
internal fun funA() {}
val a = ""
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
internal fun testFunA() {}
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
package test
fun foo() {
funA()
testFunA()
}
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml
Vendored
+15
View File
@@ -0,0 +1,15 @@
<?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" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="module1" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
fun b() {
}
internal fun funB() {}
var b = b()
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
internal fun testFunB() {}
jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
package test
fun bar() {
funB()
testFunB()
}
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt
Vendored
+4
View File
@@ -0,0 +1,4 @@
Cannot access 'funA': it is 'internal' in 'test' at line 4, column 5
Cannot access 'funB': it is 'internal' in 'test' at line 4, column 5
Cannot access 'testFunA': it is 'internal' in 'test' at line 5, column 5
Cannot access 'testFunB': it is 'internal' in 'test' at line 5, column 5
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr
Vendored
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
<component name="CopyrightManager" default="">
<module2copyright />
</component>
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
<module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
</component>
</project>
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml
Vendored
+15
View File
@@ -0,0 +1,15 @@
<?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" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="module2" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
fun a() {
}
internal fun funA() {}
val a = ""
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
internal fun testFunA() {}
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
package test
fun foo() {
funB()
testFunB()
}
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml
Vendored
+15
View File
@@ -0,0 +1,15 @@
<?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" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="module1" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
fun b() {
}
internal fun funB() {}
var b = b()
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
internal fun testFunB() {}
jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
package test
fun bar() {
funA()
testFunA()
}