[Test] Introduce new syntax for dependsOn dependencies

compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Modules.kt

@@ -18,11 +18,17 @@ data class TestModule(
     val frontendKind: FrontendKind<*>,
     val binaryKind: BinaryKind<*>,
     val files: List<TestFile>,
-    val dependencies: List<DependencyDescription>,
-    val friends: List<DependencyDescription>,
+    val allDependencies: List<DependencyDescription>,
     val directives: RegisteredDirectives,
     val languageVersionSettings: LanguageVersionSettings
 ) {
+    val regularDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.RegularDependency }
+    val friendDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.FriendDependency }
+    val dependsOnDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.DependsOnDependency }
+
     override fun equals(other: Any?): Boolean =
         other is TestModule && name == other.name
 
@@ -33,7 +39,7 @@ data class TestModule(
             appendLine("Module: $name")
             appendLine("targetPlatform = $targetPlatform")
             appendLine("Dependencies:")
-            dependencies.forEach { appendLine("  $it") }
+            allDependencies.forEach { appendLine("  $it") }
             appendLine("Directives:\n  $directives")
             files.forEach { appendLine(it) }
         }
@@ -56,8 +62,9 @@ class TestFile(
 }
 
 enum class DependencyRelation {
-    Dependency,
-    DependsOn
+    RegularDependency,
+    FriendDependency,
+    DependsOnDependency
 }
 
 enum class DependencyKind {