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

Updated constraint system tests

Browse Source
This commit is contained in:
Svetlana Isakova
2015-06-27 15:50:39 +03:00
parent cf64687b02
commit 1463ff7258
22 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds
Vendored
+1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+2 -1
View File
@@ -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
Vendored
+4 -3
View File
@@ -3,8 +3,8 @@ VARIABLES T P
SUBTYPE T Int
type parameter bounds:
T <: Int
P <: Int
T >: 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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
Vendored
+1
View File
@@ -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
+5 -6
View File
@@ -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"
for (typeParameter in typeParameterDescriptors) {
val parameterType = testDeclarations.getType(typeParameter.getName().asString())
val result = typeParameterDescriptors.map {
val parameterType = testDeclarations.getType(it.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)