Updated constraint system tests

compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds

@@ -12,6 +12,7 @@ status:
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: false

compiler/testData/constraintSystem/checkStatus/successful.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Int
+T=Int

compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds

@@ -11,6 +11,7 @@ status:
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: true
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false
 -isSuccessful: false

compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds

@@ -11,6 +11,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false
 -isSuccessful: false

compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds

@@ -12,6 +12,7 @@ status:
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: true
 -isSuccessful: false

compiler/testData/constraintSystem/computeValues/contradiction.bounds

@@ -12,6 +12,7 @@ status:
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: false

compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds

@@ -12,6 +12,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true

compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds

@@ -12,6 +12,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true

compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds

@@ -13,6 +13,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true

compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds

@@ -12,6 +12,7 @@ status:
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: false

compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Long
+T=Long

compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Int
+T=Int

compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Comparable<out Any?>
+T=Comparable<out Any?>

compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Int
+T=Int

compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Byte
+T=Byte

compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds

@@ -11,9 +11,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Int
+T=Int

compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds

@@ -12,9 +12,10 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
-T=Short
+T=Short

compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds

@@ -3,8 +3,8 @@ VARIABLES T P
 SUBTYPE T Int
 
 type parameter bounds:
-T <: Int
+T >: P, <: Int
-P <: Int
+P <: T, <: Int
 
 status:
 -hasCannotCaptureTypesError: false
@@ -12,10 +12,11 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true
 
 result:
 T=Int
-P=Int
+P=Int

compiler/testData/constraintSystem/variance/consumer.bounds

@@ -11,6 +11,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true

compiler/testData/constraintSystem/variance/invariant.bounds

@@ -11,6 +11,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true

compiler/testData/constraintSystem/variance/producer.bounds

@@ -11,6 +11,7 @@ status:
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
 -hasTypeConstructorMismatch: false
+-hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: true

compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt

@@ -105,15 +105,14 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() {
         val resultingStatus = Renderers.RENDER_CONSTRAINT_SYSTEM_SHORT.render(constraintSystem)
 
         val resultingSubstitutor = constraintSystem.getResultingSubstitutor()
-        val result = StringBuilder() append "result:\n"
+        val result = typeParameterDescriptors.map {
-        for (typeParameter in typeParameterDescriptors) {
+            val parameterType = testDeclarations.getType(it.getName().asString())
-            val parameterType = testDeclarations.getType(typeParameter.getName().asString())
             val resultType = resultingSubstitutor.substitute(parameterType, Variance.INVARIANT)
-            result append "${typeParameter.getName()}=${resultType?.let{ DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it) }}\n"
+            "${it.getName()}=${resultType?.let{ DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it) }}"
-        }
+        }.join("\n", prefix = "result:\n")
 
         val boundsFile = File(filePath.replace("constraints", "bounds"))
-        JetTestUtils.assertEqualsToFile(boundsFile, "$constraintsFileText\n\n$resultingStatus\n\n$result\n")
+        JetTestUtils.assertEqualsToFile(boundsFile, "$constraintsFileText\n\n$resultingStatus\n\n$result")
     }
 
     class MyConstraint(val kind: MyConstraintKind, val firstType: String, val secondType: String, val isWeak: Boolean)