From 9be181f1ad23fff929db1a5972e6caf07c2a87d3 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Thu, 9 Jun 2022 11:12:39 +0200 Subject: [PATCH] [FE 1.0] Remove constraint system tests These tests used the old type inference constraint system, so it didn't cover the current compiler logic almost at all It'd be fine to implement similar test for the new type inference constraint system ^KT-52699 --- .../checkStatus/conflictingConstraints.bounds | 22 - .../conflictingConstraints.constraints | 4 - .../checkStatus/successful.bounds | 22 - .../checkStatus/successful.constraints | 4 - .../typeConstructorMismatch.bounds | 21 - .../typeConstructorMismatch.constraints | 3 - .../checkStatus/unknownParameters.bounds | 21 - .../checkStatus/unknownParameters.constraints | 3 - .../computeValues/contradiction.bounds | 22 - .../computeValues/contradiction.constraints | 4 - .../computeValues/subTypeOfUpperBounds.bounds | 22 - .../subTypeOfUpperBounds.constraints | 4 - .../superTypeOfLowerBounds1.bounds | 22 - .../superTypeOfLowerBounds1.constraints | 4 - .../superTypeOfLowerBounds2.bounds | 23 - .../superTypeOfLowerBounds2.constraints | 5 - .../testData/constraintSystem/declarations.kt | 15 - .../integerValueTypes/byteOverflow.bounds | 22 - .../byteOverflow.constraints | 4 - .../integerValueTypes/defaultLong.bounds | 22 - .../integerValueTypes/defaultLong.constraints | 4 - .../integerValueTypes/numberAndAny.bounds | 22 - .../numberAndAny.constraints | 4 - .../integerValueTypes/numberAndString.bounds | 22 - .../numberAndString.constraints | 4 - .../integerValueTypes/severalNumbers.bounds | 22 - .../severalNumbers.constraints | 4 - .../integerValueTypes/simpleByte.bounds | 22 - .../integerValueTypes/simpleByte.constraints | 4 - .../integerValueTypes/simpleInt.bounds | 21 - .../integerValueTypes/simpleInt.constraints | 3 - .../integerValueTypes/simpleShort.bounds | 22 - .../integerValueTypes/simpleShort.constraints | 4 - .../direct/contravariant/varEqDepEq.bounds | 24 - .../contravariant/varEqDepEq.constraints | 4 - .../direct/contravariant/varEqDepSub.bounds | 24 - .../contravariant/varEqDepSub.constraints | 4 - .../direct/contravariant/varEqDepSuper.bounds | 24 - .../contravariant/varEqDepSuper.constraints | 4 - .../direct/contravariant/varSubDepEq.bounds | 24 - .../contravariant/varSubDepEq.constraints | 4 - .../direct/contravariant/varSubDepSub.bounds | 24 - .../contravariant/varSubDepSub.constraints | 4 - .../contravariant/varSubDepSuper.bounds | 24 - .../contravariant/varSubDepSuper.constraints | 4 - .../direct/contravariant/varSuperDepEq.bounds | 24 - .../contravariant/varSuperDepEq.constraints | 4 - .../contravariant/varSuperDepSub.bounds | 24 - .../contravariant/varSuperDepSub.constraints | 4 - .../contravariant/varSuperDepSuper.bounds | 24 - .../varSuperDepSuper.constraints | 4 - .../direct/covariant/varEqDepEq.bounds | 24 - .../direct/covariant/varEqDepEq.constraints | 4 - .../direct/covariant/varEqDepSub.bounds | 24 - .../direct/covariant/varEqDepSub.constraints | 4 - .../direct/covariant/varEqDepSuper.bounds | 24 - .../covariant/varEqDepSuper.constraints | 4 - .../direct/covariant/varSubDepEq.bounds | 24 - .../direct/covariant/varSubDepEq.constraints | 4 - .../direct/covariant/varSubDepSub.bounds | 24 - .../direct/covariant/varSubDepSub.constraints | 4 - .../direct/covariant/varSubDepSuper.bounds | 24 - .../covariant/varSubDepSuper.constraints | 4 - .../direct/covariant/varSuperDepEq.bounds | 24 - .../covariant/varSuperDepEq.constraints | 4 - .../direct/covariant/varSuperDepSub.bounds | 24 - .../covariant/varSuperDepSub.constraints | 4 - .../direct/covariant/varSuperDepSuper.bounds | 24 - .../covariant/varSuperDepSuper.constraints | 4 - .../direct/invariant/varEqDepEq.bounds | 24 - .../direct/invariant/varEqDepEq.constraints | 4 - .../direct/invariant/varEqDepSub.bounds | 24 - .../direct/invariant/varEqDepSub.constraints | 4 - .../direct/invariant/varEqDepSuper.bounds | 24 - .../invariant/varEqDepSuper.constraints | 4 - .../direct/invariant/varSubDepEq.bounds | 24 - .../direct/invariant/varSubDepEq.constraints | 4 - .../direct/invariant/varSubDepSub.bounds | 24 - .../direct/invariant/varSubDepSub.constraints | 4 - .../direct/invariant/varSubDepSuper.bounds | 24 - .../invariant/varSubDepSuper.constraints | 4 - .../direct/invariant/varSuperDepEq.bounds | 24 - .../invariant/varSuperDepEq.constraints | 4 - .../direct/invariant/varSuperDepSub.bounds | 24 - .../invariant/varSuperDepSub.constraints | 4 - .../direct/invariant/varSuperDepSuper.bounds | 24 - .../invariant/varSuperDepSuper.constraints | 4 - .../interdependency/interdependency1.bounds | 28 - .../interdependency1.constraints | 6 - .../interdependency/interdependency2.bounds | 28 - .../interdependency2.constraints | 6 - .../interdependency/interdependency3.bounds | 28 - .../interdependency3.constraints | 6 - .../nullable/contravariant/varEqDepEq.bounds | 24 - .../contravariant/varEqDepEq.constraints | 4 - .../nullable/contravariant/varEqDepSub.bounds | 24 - .../contravariant/varEqDepSub.constraints | 4 - .../contravariant/varEqDepSuper.bounds | 24 - .../contravariant/varEqDepSuper.constraints | 4 - .../nullable/contravariant/varSubDepEq.bounds | 24 - .../contravariant/varSubDepEq.constraints | 4 - .../contravariant/varSubDepSub.bounds | 24 - .../contravariant/varSubDepSub.constraints | 4 - .../contravariant/varSubDepSuper.bounds | 24 - .../contravariant/varSubDepSuper.constraints | 4 - .../contravariant/varSuperDepEq.bounds | 24 - .../contravariant/varSuperDepEq.constraints | 4 - .../contravariant/varSuperDepSub.bounds | 24 - .../contravariant/varSuperDepSub.constraints | 4 - .../contravariant/varSuperDepSuper.bounds | 24 - .../varSuperDepSuper.constraints | 4 - .../nullable/covariant/varEqDepEq.bounds | 24 - .../nullable/covariant/varEqDepEq.constraints | 4 - .../nullable/covariant/varEqDepSub.bounds | 24 - .../covariant/varEqDepSub.constraints | 4 - .../nullable/covariant/varEqDepSuper.bounds | 24 - .../covariant/varEqDepSuper.constraints | 4 - .../nullable/covariant/varSubDepEq.bounds | 24 - .../covariant/varSubDepEq.constraints | 4 - .../nullable/covariant/varSubDepSub.bounds | 24 - .../covariant/varSubDepSub.constraints | 4 - .../nullable/covariant/varSubDepSuper.bounds | 24 - .../covariant/varSubDepSuper.constraints | 4 - .../nullable/covariant/varSuperDepEq.bounds | 24 - .../covariant/varSuperDepEq.constraints | 4 - .../nullable/covariant/varSuperDepSub.bounds | 24 - .../covariant/varSuperDepSub.constraints | 4 - .../covariant/varSuperDepSuper.bounds | 24 - .../covariant/varSuperDepSuper.constraints | 4 - .../nullable/invariant/varEqDepEq.bounds | 24 - .../nullable/invariant/varEqDepEq.constraints | 4 - .../nullable/invariant/varEqDepSub.bounds | 24 - .../invariant/varEqDepSub.constraints | 4 - .../nullable/invariant/varEqDepSuper.bounds | 24 - .../invariant/varEqDepSuper.constraints | 4 - .../nullable/invariant/varSubDepEq.bounds | 24 - .../invariant/varSubDepEq.constraints | 4 - .../nullable/invariant/varSubDepSub.bounds | 24 - .../invariant/varSubDepSub.constraints | 4 - .../nullable/invariant/varSubDepSuper.bounds | 24 - .../invariant/varSubDepSuper.constraints | 4 - .../nullable/invariant/varSuperDepEq.bounds | 24 - .../invariant/varSuperDepEq.constraints | 4 - .../nullable/invariant/varSuperDepSub.bounds | 24 - .../invariant/varSuperDepSub.constraints | 4 - .../invariant/varSuperDepSuper.bounds | 24 - .../invariant/varSuperDepSuper.constraints | 4 - .../other/constraintForNullables.bounds | 24 - .../other/constraintForNullables.constraints | 4 - .../other/nestedConsumer.bounds | 24 - .../other/nestedConsumer.constraints | 4 - .../other/nestedConsumer1.bounds | 24 - .../other/nestedConsumer1.constraints | 4 - .../other/nestedInvConsumer.bounds | 24 - .../other/nestedInvConsumer.constraints | 4 - .../other/nestedInvProducer.bounds | 24 - .../other/nestedInvProducer.constraints | 4 - .../other/nestedProducer.bounds | 24 - .../other/nestedProducer.constraints | 4 - .../other/nestedProducerAndConsumer.bounds | 24 - .../nestedProducerAndConsumer.constraints | 4 - .../other/severalOccurrences.bounds | 24 - .../other/severalOccurrences.constraints | 4 - .../severalVariables/other/simpleFun.bounds | 27 - .../other/simpleFun.constraints | 5 - .../other/simpleThreeVars.bounds | 27 - .../other/simpleThreeVars.constraints | 5 - .../simpleThreeVarsNoIncorporation.bounds | 27 - ...simpleThreeVarsNoIncorporation.constraints | 5 - ...simpleThreeVarsNoIncorporationFixed.bounds | 28 - ...eThreeVarsNoIncorporationFixed.constraints | 6 - .../recursive/implicitlyRecursive.bounds | 27 - .../recursive/implicitlyRecursive.constraints | 5 - .../severalVariables/recursive/kt8879.bounds | 24 - .../recursive/kt8879.constraints | 4 - .../recursive/mutuallyRecursive.bounds | 24 - .../recursive/mutuallyRecursive.constraints | 4 - .../recursive/simpleRecursive.bounds | 22 - .../recursive/simpleRecursive.constraints | 4 - .../reversed/contravariant/varEqDepEq.bounds | 24 - .../contravariant/varEqDepEq.constraints | 4 - .../reversed/contravariant/varEqDepSub.bounds | 24 - .../contravariant/varEqDepSub.constraints | 4 - .../contravariant/varEqDepSuper.bounds | 24 - .../contravariant/varEqDepSuper.constraints | 4 - .../reversed/contravariant/varSubDepEq.bounds | 24 - .../contravariant/varSubDepEq.constraints | 4 - .../contravariant/varSubDepSub.bounds | 24 - .../contravariant/varSubDepSub.constraints | 4 - .../contravariant/varSubDepSuper.bounds | 24 - .../contravariant/varSubDepSuper.constraints | 4 - .../contravariant/varSuperDepEq.bounds | 24 - .../contravariant/varSuperDepEq.constraints | 4 - .../contravariant/varSuperDepSub.bounds | 24 - .../contravariant/varSuperDepSub.constraints | 4 - .../contravariant/varSuperDepSuper.bounds | 24 - .../varSuperDepSuper.constraints | 4 - .../reversed/covariant/varEqDepEq.bounds | 24 - .../reversed/covariant/varEqDepEq.constraints | 4 - .../reversed/covariant/varEqDepSub.bounds | 24 - .../covariant/varEqDepSub.constraints | 4 - .../reversed/covariant/varEqDepSuper.bounds | 24 - .../covariant/varEqDepSuper.constraints | 4 - .../reversed/covariant/varSubDepEq.bounds | 24 - .../covariant/varSubDepEq.constraints | 4 - .../reversed/covariant/varSubDepSub.bounds | 24 - .../covariant/varSubDepSub.constraints | 4 - .../reversed/covariant/varSubDepSuper.bounds | 24 - .../covariant/varSubDepSuper.constraints | 4 - .../reversed/covariant/varSuperDepEq.bounds | 24 - .../covariant/varSuperDepEq.constraints | 4 - .../reversed/covariant/varSuperDepSub.bounds | 24 - .../covariant/varSuperDepSub.constraints | 4 - .../covariant/varSuperDepSuper.bounds | 24 - .../covariant/varSuperDepSuper.constraints | 4 - .../reversed/invariant/varEqDepEq.bounds | 24 - .../reversed/invariant/varEqDepEq.constraints | 4 - .../reversed/invariant/varEqDepSub.bounds | 24 - .../invariant/varEqDepSub.constraints | 4 - .../reversed/invariant/varEqDepSuper.bounds | 24 - .../invariant/varEqDepSuper.constraints | 4 - .../reversed/invariant/varSubDepEq.bounds | 24 - .../invariant/varSubDepEq.constraints | 4 - .../reversed/invariant/varSubDepSub.bounds | 24 - .../invariant/varSubDepSub.constraints | 4 - .../reversed/invariant/varSubDepSuper.bounds | 24 - .../invariant/varSubDepSuper.constraints | 4 - .../reversed/invariant/varSuperDepEq.bounds | 24 - .../invariant/varSuperDepEq.constraints | 4 - .../reversed/invariant/varSuperDepSub.bounds | 24 - .../invariant/varSuperDepSub.constraints | 4 - .../invariant/varSuperDepSuper.bounds | 24 - .../invariant/varSuperDepSuper.constraints | 4 - .../severalVariables/simpleDependency.bounds | 23 - .../simpleDependency.constraints | 3 - .../severalVariables/simpleEquality.bounds | 24 - .../simpleEquality.constraints | 4 - .../severalVariables/simpleEquality1.bounds | 24 - .../simpleEquality1.constraints | 4 - .../simpleReversedDependency.bounds | 24 - .../simpleReversedDependency.constraints | 4 - .../severalVariables/simpleSubtype.bounds | 24 - .../simpleSubtype.constraints | 4 - .../severalVariables/simpleSubtype1.bounds | 24 - .../simpleSubtype1.constraints | 4 - .../constraintSystem/variance/consumer.bounds | 21 - .../variance/consumer.constraints | 3 - .../variance/invariant.bounds | 21 - .../variance/invariant.constraints | 3 - .../constraintSystem/variance/producer.bounds | 21 - .../variance/producer.constraints | 3 - .../AbstractConstraintSystemTest.kt | 154 --- .../ConstraintSystemTestData.kt | 84 -- .../generators/GenerateJUnit3CompilerTests.kt | 5 - .../ConstraintSystemTestGenerated.java | 916 ------------------ 255 files changed, 4662 deletions(-) delete mode 100644 compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds delete mode 100644 compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints delete mode 100644 compiler/testData/constraintSystem/checkStatus/successful.bounds delete mode 100644 compiler/testData/constraintSystem/checkStatus/successful.constraints delete mode 100644 compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds delete mode 100644 compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints delete mode 100644 compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds delete mode 100644 compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints delete mode 100644 compiler/testData/constraintSystem/computeValues/contradiction.bounds delete mode 100644 compiler/testData/constraintSystem/computeValues/contradiction.constraints delete mode 100644 compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds delete mode 100644 compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints delete mode 100644 compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds delete mode 100644 compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints delete mode 100644 compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds delete mode 100644 compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints delete mode 100644 compiler/testData/constraintSystem/declarations.kt delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds delete mode 100644 compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/kt8879.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds delete mode 100644 compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints delete mode 100644 compiler/testData/constraintSystem/variance/consumer.bounds delete mode 100644 compiler/testData/constraintSystem/variance/consumer.constraints delete mode 100644 compiler/testData/constraintSystem/variance/invariant.bounds delete mode 100644 compiler/testData/constraintSystem/variance/invariant.constraints delete mode 100644 compiler/testData/constraintSystem/variance/producer.bounds delete mode 100644 compiler/testData/constraintSystem/variance/producer.constraints delete mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt delete mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt delete mode 100644 compiler/tests-gen/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds deleted file mode 100644 index 026d6ad0b43..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T <: Int -T >: String - -type parameter bounds: -T <: Int, >: String - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: true --hasContradiction: true --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints deleted file mode 100644 index 73b1e047485..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T <: Int -T >: String diff --git a/compiler/testData/constraintSystem/checkStatus/successful.bounds b/compiler/testData/constraintSystem/checkStatus/successful.bounds deleted file mode 100644 index bc851a58fef..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/successful.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T <: Int -T >: Int - -type parameter bounds: -T <: Int, >: Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int diff --git a/compiler/testData/constraintSystem/checkStatus/successful.constraints b/compiler/testData/constraintSystem/checkStatus/successful.constraints deleted file mode 100644 index a6d9b0b7d12..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/successful.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T <: Int -T >: Int diff --git a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds deleted file mode 100644 index 27aab64db43..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -List <: Int - -type parameter bounds: -T - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: true --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints deleted file mode 100644 index eedca733b0e..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T - -List <: Int diff --git a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds b/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds deleted file mode 100644 index 9368f72120e..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -Any <: Any - -type parameter bounds: -T - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints b/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints deleted file mode 100644 index 01d5712133b..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T - -Any <: Any diff --git a/compiler/testData/constraintSystem/computeValues/contradiction.bounds b/compiler/testData/constraintSystem/computeValues/contradiction.bounds deleted file mode 100644 index ba7bac13086..00000000000 --- a/compiler/testData/constraintSystem/computeValues/contradiction.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T <: B -T >: A - -type parameter bounds: -T <: B, >: A - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: true --hasContradiction: true --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/computeValues/contradiction.constraints b/compiler/testData/constraintSystem/computeValues/contradiction.constraints deleted file mode 100644 index 86de4a85dd0..00000000000 --- a/compiler/testData/constraintSystem/computeValues/contradiction.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T <: B -T >: A diff --git a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds deleted file mode 100644 index 46bf6ec0cad..00000000000 --- a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T <: A -T <: B - -type parameter bounds: -T <: A, <: B - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=B diff --git a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints deleted file mode 100644 index 9cd0d24fe2c..00000000000 --- a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T <: A -T <: B diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds deleted file mode 100644 index 16bce337d14..00000000000 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T <: A -T >: C - -type parameter bounds: -T <: A, >: C - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=C diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints deleted file mode 100644 index 40d55d2f8c8..00000000000 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T <: A -T >: C diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds deleted file mode 100644 index 7c5b7497a88..00000000000 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds +++ /dev/null @@ -1,23 +0,0 @@ -VARIABLES T - -T <: A -T >: B -T >: C - -type parameter bounds: -T <: A, >: B, >: C - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=B diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints deleted file mode 100644 index e1fed467904..00000000000 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints +++ /dev/null @@ -1,5 +0,0 @@ -VARIABLES T - -T <: A -T >: B -T >: C diff --git a/compiler/testData/constraintSystem/declarations.kt b/compiler/testData/constraintSystem/declarations.kt deleted file mode 100644 index 60253584451..00000000000 --- a/compiler/testData/constraintSystem/declarations.kt +++ /dev/null @@ -1,15 +0,0 @@ -fun foo() = 42 - -interface A -interface B : A -interface C : B - -interface Consumer -interface Producer -interface Inv - -interface My -interface Successor : My - -interface Two -interface Fun \ No newline at end of file diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds deleted file mode 100644 index 20901f01445..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1000) -T <: Byte - -type parameter bounds: -T >: IntegerValueType(1000), <: Byte - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: true --hasContradiction: true --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints deleted file mode 100644 index 0473f499c94..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1000) -T <: Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds deleted file mode 100644 index a88ae4c3b3b..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T >: IntegerValueType(10000000000) - -type parameter bounds: -T >: IntegerValueType(1), >: IntegerValueType(10000000000) - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Long diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints deleted file mode 100644 index 6270d70a68a..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T >: IntegerValueType(10000000000) diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds deleted file mode 100644 index a701c900d7a..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T <: Any - -type parameter bounds: -T >: IntegerValueType(1), <: Any - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints deleted file mode 100644 index da000c8feb0..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T <: Any diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds deleted file mode 100644 index 91a9a41735a..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T >: String - -type parameter bounds: -T >: IntegerValueType(1), >: String - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Any diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints deleted file mode 100644 index 9f91f37e011..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T >: String diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds deleted file mode 100644 index 044dac7ac7a..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T >: IntegerValueType(1000) - -type parameter bounds: -T >: IntegerValueType(1), >: IntegerValueType(1000) - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints deleted file mode 100644 index bafce1a8007..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T >: IntegerValueType(1000) diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds deleted file mode 100644 index 80196f942c5..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T <: Byte - -type parameter bounds: -T >: IntegerValueType(1), <: Byte - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints deleted file mode 100644 index 9da0fc9e2c2..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T <: Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds deleted file mode 100644 index e8cf39214a9..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) - -type parameter bounds: -T >: IntegerValueType(1) - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints deleted file mode 100644 index aa8f78b19f4..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds deleted file mode 100644 index 188d11c91bb..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T <: Short - -type parameter bounds: -T >: IntegerValueType(1), <: Short - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Short diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints deleted file mode 100644 index a3ba83baf5d..00000000000 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T >: IntegerValueType(1) -T <: Short diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds deleted file mode 100644 index f82273991f8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P := Consumer - -type parameter bounds: -T := Int -P := Consumer*, := Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints deleted file mode 100644 index e4e3eb8e1b0..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds deleted file mode 100644 index eddbfc7bda2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P <: Consumer - -type parameter bounds: -T := Int -P <: Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints deleted file mode 100644 index 67567cd2dee..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds deleted file mode 100644 index 3ed0d429699..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P >: Consumer - -type parameter bounds: -T := Int -P >: Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints deleted file mode 100644 index 52d5a35b1e8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds deleted file mode 100644 index 0283f900bed..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P := Consumer - -type parameter bounds: -T <: Int -P := Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints deleted file mode 100644 index 53d27506f5e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds deleted file mode 100644 index e731dc8277b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Consumer - -type parameter bounds: -T <: Int -P <: Consumer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints deleted file mode 100644 index dfa315bf976..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds deleted file mode 100644 index 2ea7f32bf44..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Consumer - -type parameter bounds: -T <: Int -P >: Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints deleted file mode 100644 index fa629778192..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds deleted file mode 100644 index 3c19a6f658b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P := Consumer - -type parameter bounds: -T >: Int -P := Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints deleted file mode 100644 index 0549095d95c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds deleted file mode 100644 index a13c0ecd98b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Consumer - -type parameter bounds: -T >: Int -P <: Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints deleted file mode 100644 index eafcc55663e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds deleted file mode 100644 index 3b67bb1847c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Consumer - -type parameter bounds: -T >: Int -P >: Consumer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints deleted file mode 100644 index 3f9d691fab5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds deleted file mode 100644 index 6c1c23cc2e4..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P := Producer - -type parameter bounds: -T := Int -P := Producer*, := Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints deleted file mode 100644 index b8682d147da..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds deleted file mode 100644 index df1f11beb80..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P <: Producer - -type parameter bounds: -T := Int -P <: Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints deleted file mode 100644 index 35965dee809..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds deleted file mode 100644 index 567bccbf8d8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P >: Producer - -type parameter bounds: -T := Int -P >: Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints deleted file mode 100644 index dc9922a8970..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds deleted file mode 100644 index bc5a87d6e4a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P := Producer - -type parameter bounds: -T <: Int -P := Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints deleted file mode 100644 index e396ec93736..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds deleted file mode 100644 index d78fe1e77e4..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Producer - -type parameter bounds: -T <: Int -P <: Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints deleted file mode 100644 index 591c1e73a05..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds deleted file mode 100644 index 422c3e8948b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Producer - -type parameter bounds: -T <: Int -P >: Producer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints deleted file mode 100644 index f5afe6e411d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds deleted file mode 100644 index d92418e98bd..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P := Producer - -type parameter bounds: -T >: Int -P := Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints deleted file mode 100644 index 80c0c77152d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds deleted file mode 100644 index ec64d4dd731..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Producer - -type parameter bounds: -T >: Int -P <: Producer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints deleted file mode 100644 index d6697a53b90..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds deleted file mode 100644 index 8a23374a889..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Producer - -type parameter bounds: -T >: Int -P >: Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints deleted file mode 100644 index b2345b38016..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds deleted file mode 100644 index 01e53ecb593..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P := My - -type parameter bounds: -T := Int -P := My*, := My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints deleted file mode 100644 index 8dbe999f027..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P := My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds deleted file mode 100644 index e45c1dac710..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P <: My - -type parameter bounds: -T := Int -P <: My*, <: My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints deleted file mode 100644 index 3d7c94d3f01..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds deleted file mode 100644 index 3a718ee15dc..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P >: My - -type parameter bounds: -T := Int -P >: My*, >: My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints deleted file mode 100644 index ce2fae0e68e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds deleted file mode 100644 index 75d79b16cda..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P := My - -type parameter bounds: -T <: Int -P := My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints deleted file mode 100644 index 07b20eef913..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P := My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds deleted file mode 100644 index 8c0d48bdba9..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: My - -type parameter bounds: -T <: Int -P <: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints deleted file mode 100644 index 3e58fb5b2a1..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds deleted file mode 100644 index 3d13b59501a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P >: My - -type parameter bounds: -T <: Int -P >: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints deleted file mode 100644 index 802fa4fa77f..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds deleted file mode 100644 index 9e36c4e9dc2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P := My - -type parameter bounds: -T >: Int -P := My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints deleted file mode 100644 index b4c5f83202f..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P := My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds deleted file mode 100644 index a51efab10c9..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P <: My - -type parameter bounds: -T >: Int -P <: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints deleted file mode 100644 index da6df183aa5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds deleted file mode 100644 index d28e83b8bca..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P >: My - -type parameter bounds: -T >: Int -P >: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints deleted file mode 100644 index 34597d6a9a7..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds deleted file mode 100644 index b6d8f5273dd..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds +++ /dev/null @@ -1,28 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -P <: My -Successor <: P -Int <: T - -type parameter bounds: -T := T*, := E*, >: Int, := Int -P <: My*, >: Successor*, >: Successor*, <: My*, <: My, >: Successor, := Successor -E := T*, := E*, >: Int, := Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Successor -E=Int diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints deleted file mode 100644 index 700a203d296..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints +++ /dev/null @@ -1,6 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -P <: My -Successor <: P -Int <: T diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds deleted file mode 100644 index 06ddb842686..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds +++ /dev/null @@ -1,28 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -P <: My -Int <: T -Successor <: P - -type parameter bounds: -T >: Int, := T*, := E*, := Int -P <: My*, >: Successor*, >: Successor*, <: My*, <: My, >: Successor, := Successor -E := T*, >: Int, := E*, := Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Successor -E=Int diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints deleted file mode 100644 index c659df345ce..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints +++ /dev/null @@ -1,6 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -P <: My -Int <: T -Successor <: P diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds deleted file mode 100644 index f71a2a1af20..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds +++ /dev/null @@ -1,28 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -Int <: T -Successor <: P -P <: My - -type parameter bounds: -T >: Int, := T*, := E*, := Int -P >: Successor*, <: My*, >: Successor*, <: My*, <: My, >: Successor, := Successor -E := T*, >: Int, := E*, := Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Successor -E=Int diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints deleted file mode 100644 index c004de9df4c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints +++ /dev/null @@ -1,6 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -Int <: T -Successor <: P -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds deleted file mode 100644 index a05534389d6..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P := Consumer - -type parameter bounds: -T := Int, >: Int, <: Int? -P := Consumer*, := Consumer, <: Consumer, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints deleted file mode 100644 index c1736b057c7..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds deleted file mode 100644 index 15f42f67782..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P <: Consumer - -type parameter bounds: -T := Int -P <: Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints deleted file mode 100644 index 55f677f6ddb..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds deleted file mode 100644 index 8ee0a9e841e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P >: Consumer - -type parameter bounds: -T := Int -P >: Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints deleted file mode 100644 index 09f513cc7b4..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds deleted file mode 100644 index c4983780b90..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P := Consumer - -type parameter bounds: -T <: Int, <: Int? -P := Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints deleted file mode 100644 index 5271ac8ec41..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds deleted file mode 100644 index b9e8b1c33a3..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Consumer - -type parameter bounds: -T <: Int -P <: Consumer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints deleted file mode 100644 index ae64ed7c915..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds deleted file mode 100644 index 949b8de4c3b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Consumer - -type parameter bounds: -T <: Int -P >: Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints deleted file mode 100644 index 5ed24171e25..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds deleted file mode 100644 index 0c6c10def7a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P := Consumer - -type parameter bounds: -T >: Int -P := Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints deleted file mode 100644 index af1292bcb12..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds deleted file mode 100644 index 0a71e6ee9ec..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Consumer - -type parameter bounds: -T >: Int -P <: Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints deleted file mode 100644 index c40e9e4214e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds deleted file mode 100644 index c13e4356cbe..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Consumer - -type parameter bounds: -T >: Int -P >: Consumer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints deleted file mode 100644 index 154953e0dc0..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds deleted file mode 100644 index 7a198dc59b0..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P := Producer - -type parameter bounds: -T := Int, >: Int, <: Int? -P := Producer*, := Producer, >: Producer, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints deleted file mode 100644 index c26a6ffd4e8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds deleted file mode 100644 index 3860dfeb1f8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P <: Producer - -type parameter bounds: -T := Int -P <: Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints deleted file mode 100644 index 05b999bba72..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds deleted file mode 100644 index 51a67a89461..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P >: Producer - -type parameter bounds: -T := Int -P >: Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints deleted file mode 100644 index 696c4319d1d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds deleted file mode 100644 index 5b2dce63900..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P := Producer - -type parameter bounds: -T <: Int, <: Int? -P := Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints deleted file mode 100644 index bca5d5feb30..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds deleted file mode 100644 index a987533ff1b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Producer - -type parameter bounds: -T <: Int -P <: Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints deleted file mode 100644 index 7a0eaffde51..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds deleted file mode 100644 index 441d5df7733..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Producer - -type parameter bounds: -T <: Int -P >: Producer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints deleted file mode 100644 index d0250712a47..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds deleted file mode 100644 index 89cee4e1ec5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P := Producer - -type parameter bounds: -T >: Int -P := Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints deleted file mode 100644 index 514bbd7d40c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds deleted file mode 100644 index 8afeb469cc6..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Producer - -type parameter bounds: -T >: Int -P <: Producer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints deleted file mode 100644 index a38123fd422..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds deleted file mode 100644 index 47fcae69fee..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Producer - -type parameter bounds: -T >: Int -P >: Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints deleted file mode 100644 index 3e222362b82..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds deleted file mode 100644 index b7ba8727a86..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P := My - -type parameter bounds: -T := Int, >: Int, <: Int? -P := My*, := My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints deleted file mode 100644 index 84f297651e6..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P := My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds deleted file mode 100644 index ee21a4b08dc..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P <: My - -type parameter bounds: -T := Int -P <: My*, <: My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints deleted file mode 100644 index d37a697ae35..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds deleted file mode 100644 index 1eef48879c2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := Int -P >: My - -type parameter bounds: -T := Int -P >: My*, >: My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints deleted file mode 100644 index f693412f981..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := Int -P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds deleted file mode 100644 index 46e120d8a13..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P := My - -type parameter bounds: -T <: Int -P := My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints deleted file mode 100644 index 5fd3076befd..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P := My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds deleted file mode 100644 index 2f4f42d38f5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: My - -type parameter bounds: -T <: Int -P <: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints deleted file mode 100644 index 1814a0991d0..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds deleted file mode 100644 index b4422e8b7a7..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P >: My - -type parameter bounds: -T <: Int -P >: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints deleted file mode 100644 index 7b6aad251dc..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds deleted file mode 100644 index 2dfae2d7b29..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P := My - -type parameter bounds: -T >: Int -P := My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints deleted file mode 100644 index e6f0b95000a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P := My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds deleted file mode 100644 index c2369d619d1..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P <: My - -type parameter bounds: -T >: Int -P <: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints deleted file mode 100644 index f78eb65acfe..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds deleted file mode 100644 index bf850eda3c2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T >: Int -P >: My - -type parameter bounds: -T >: Int -P >: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints deleted file mode 100644 index 003e8f08470..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T >: Int -P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds deleted file mode 100644 index e166c724122..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T? <: P? -P <: Int - -type parameter bounds: -T <: P?*, <: P*, <: Int, <: Int? -P >: T*, <: Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints deleted file mode 100644 index 673300163fa..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T? <: P? -P <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds deleted file mode 100644 index 827695cb023..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -Int <: T -P := Consumer> - -type parameter bounds: -T >: Int -P := Consumer>*, >: Consumer> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints deleted file mode 100644 index 2bcb86860f2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -Int <: T -P := Consumer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds deleted file mode 100644 index 626b11ecf68..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -Int <: T -P <: Consumer>> - -type parameter bounds: -T >: Int -P <: Consumer>>*, <: Consumer>> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints deleted file mode 100644 index 42efc5e0b40..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -Int <: T -P <: Consumer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds deleted file mode 100644 index 1851168470c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -Int <: T -P <: My>> - -type parameter bounds: -T >: Int -P <: My>>*, <: My>> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=My>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints deleted file mode 100644 index 9106bea3942..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -Int <: T -P <: My>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds deleted file mode 100644 index d403cdc2bae..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: My>> - -type parameter bounds: -T <: Int -P <: My>>*, <: My>> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=My>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints deleted file mode 100644 index adddfa74b0a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: My>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds deleted file mode 100644 index cb9289750f5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Producer>> - -type parameter bounds: -T <: Int -P <: Producer>>*, <: Producer>> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints deleted file mode 100644 index a6504127d85..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Producer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds deleted file mode 100644 index 8506abc9058..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -Int <: T -P <: Producer>> - -type parameter bounds: -T >: Int -P <: Producer>>*, <: Producer>> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints deleted file mode 100644 index ee92ca64885..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -Int <: T -P <: Producer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds deleted file mode 100644 index ef50eeede13..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Fun,Producer> - -type parameter bounds: -T <: Int -P <: Fun, Producer>*, <: Fun, Producer> - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Fun, Producer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints deleted file mode 100644 index 61c4ed5cfcf..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: Fun,Producer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds deleted file mode 100644 index a683d1115ab..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds +++ /dev/null @@ -1,27 +0,0 @@ -VARIABLES T P E - -Int <: T -P <: String -E <: Fun - -type parameter bounds: -T >: Int -P <: String -E <: Fun*, <: Fun*, <: Fun, <: Fun* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=String -E=Fun diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints deleted file mode 100644 index cc3233beeec..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints +++ /dev/null @@ -1,5 +0,0 @@ -VARIABLES T P E - -Int <: T -P <: String -E <: Fun diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds deleted file mode 100644 index 281f87c3b0b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds +++ /dev/null @@ -1,27 +0,0 @@ -VARIABLES T P E - -T <: P -P <: E -E <: Int - -type parameter bounds: -T <: P*, <: E*, <: Int -P >: T*, <: E*, <: Int -E >: T*, >: P*, <: Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int -E=Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints deleted file mode 100644 index 50616113b85..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints +++ /dev/null @@ -1,5 +0,0 @@ -VARIABLES T P E - -T <: P -P <: E -E <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds deleted file mode 100644 index 5c7334718e8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds +++ /dev/null @@ -1,27 +0,0 @@ -VARIABLES T P E - -T <: P -P <: E -Int <: E - -type parameter bounds: -T <: P*, <: E* -P >: T*, <: E* -E >: T*, >: P*, >: Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? -P=??? -E=Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints deleted file mode 100644 index 4ffb5c15c74..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints +++ /dev/null @@ -1,5 +0,0 @@ -VARIABLES T P E - -T <: P -P <: E -Int <: E diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds deleted file mode 100644 index 94c46fc0394..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds +++ /dev/null @@ -1,28 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -T <: P -P <: E -Int <: E - -type parameter bounds: -T <: P*, <: E*, <: Int, := Int -P >: T*, <: E*, <: Int, := Int, >: Int -E >: T*, >: P*, >: Int, := Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int -E=Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints deleted file mode 100644 index e926273422b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints +++ /dev/null @@ -1,6 +0,0 @@ -VARIABLES T P E -FIX_VARIABLES - -T <: P -P <: E -Int <: E diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds deleted file mode 100644 index b8efc0b5d93..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds +++ /dev/null @@ -1,27 +0,0 @@ -VARIABLES T P E - -T <: Producer

-P <: Producer -E <: Producer

- -type parameter bounds: -T <: Producer

*, <: Producer>*, <: Producer>>* -P <: Producer* -E <: Producer

* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? -P=??? -E=??? diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints deleted file mode 100644 index beb7ef775e1..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints +++ /dev/null @@ -1,5 +0,0 @@ -VARIABLES T P E - -T <: Producer

-P <: Producer -E <: Producer

diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/kt8879.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/kt8879.bounds deleted file mode 100644 index fcb4f9f104d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/kt8879.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: My -Inv

<: Inv - -type parameter bounds: -T <: My*, := P*, <: My>*, <: My

*, <: My>*, <: My>>* -P := T*, <: My*, <: My>*, <: My

*, <: My>*, <: My>>* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints deleted file mode 100644 index 9ab335fa05c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: My -Inv

<: Inv diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds deleted file mode 100644 index 8237c875ff5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T := My

-P := Two - -type parameter bounds: -T := My

* -P := Two* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints deleted file mode 100644 index 2ed17521412..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T := My

-P := Two diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds deleted file mode 100644 index 2363677d28e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds +++ /dev/null @@ -1,22 +0,0 @@ -VARIABLES T - -T := Int -T := My - -type parameter bounds: -T := Int, := My*, := My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: true --hasContradiction: true --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints deleted file mode 100644 index b9aa0ae37c9..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -T := Int -T := My diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds deleted file mode 100644 index 61241bd9009..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := Consumer -T := Int - -type parameter bounds: -T := Int -P := Consumer*, := Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints deleted file mode 100644 index 87ad3fd3433..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := Consumer -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds deleted file mode 100644 index b110e13062e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: Consumer -T := Int - -type parameter bounds: -T := Int -P <: Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints deleted file mode 100644 index 351d8eaf131..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: Consumer -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds deleted file mode 100644 index d18fac737f5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: Consumer -T := Int - -type parameter bounds: -T := Int -P >: Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints deleted file mode 100644 index 369da5efafd..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: Consumer -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds deleted file mode 100644 index ab02fa3d606..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := Consumer -T <: Int - -type parameter bounds: -T <: Int -P := Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints deleted file mode 100644 index 32270663ab3..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := Consumer -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds deleted file mode 100644 index 9f4f9ed92e5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: Consumer -T <: Int - -type parameter bounds: -T <: Int -P <: Consumer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints deleted file mode 100644 index 554dba141ff..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: Consumer -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds deleted file mode 100644 index faf73e60c1b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: Consumer -T <: Int - -type parameter bounds: -T <: Int -P >: Consumer*, >: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints deleted file mode 100644 index 133d23b9695..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: Consumer -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds deleted file mode 100644 index c0de409d22d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := Consumer -T >: Int - -type parameter bounds: -T >: Int -P := Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints deleted file mode 100644 index bc5ef67d057..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := Consumer -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds deleted file mode 100644 index d0be61b3af4..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: Consumer -T >: Int - -type parameter bounds: -T >: Int -P <: Consumer*, <: Consumer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints deleted file mode 100644 index 8aa51d752f8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: Consumer -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds deleted file mode 100644 index df0974cbffa..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: Consumer -T >: Int - -type parameter bounds: -T >: Int -P >: Consumer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints deleted file mode 100644 index 5508d75c40b..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: Consumer -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds deleted file mode 100644 index db2973ed1f6..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := Producer -T := Int - -type parameter bounds: -T := Int -P := Producer*, := Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints deleted file mode 100644 index e7fb378f929..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := Producer -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds deleted file mode 100644 index 1f79bfb59dd..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: Producer -T := Int - -type parameter bounds: -T := Int -P <: Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints deleted file mode 100644 index 29dd6ed603c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: Producer -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds deleted file mode 100644 index 81c2e084958..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: Producer -T := Int - -type parameter bounds: -T := Int -P >: Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints deleted file mode 100644 index ef7338d2564..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: Producer -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds deleted file mode 100644 index 095ddf0032d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := Producer -T <: Int - -type parameter bounds: -T <: Int -P := Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints deleted file mode 100644 index fb8e245ccf5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := Producer -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds deleted file mode 100644 index 141e0431351..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: Producer -T <: Int - -type parameter bounds: -T <: Int -P <: Producer*, <: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints deleted file mode 100644 index 2d0376eff10..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: Producer -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds deleted file mode 100644 index 01b38fb6462..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: Producer -T <: Int - -type parameter bounds: -T <: Int -P >: Producer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints deleted file mode 100644 index b917df226fe..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: Producer -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds deleted file mode 100644 index 1b1f75030f2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := Producer -T >: Int - -type parameter bounds: -T >: Int -P := Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints deleted file mode 100644 index ef9b6856bc2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := Producer -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds deleted file mode 100644 index 5375baabb50..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: Producer -T >: Int - -type parameter bounds: -T >: Int -P <: Producer* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints deleted file mode 100644 index c59156c590c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: Producer -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds deleted file mode 100644 index 4701e7c9a5f..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: Producer -T >: Int - -type parameter bounds: -T >: Int -P >: Producer*, >: Producer - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Producer diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints deleted file mode 100644 index 225dedbb5ee..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: Producer -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds deleted file mode 100644 index adaeeabd4d1..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := My -T := Int - -type parameter bounds: -T := Int -P := My*, := My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints deleted file mode 100644 index 4d2c01477ce..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := My -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds deleted file mode 100644 index 24fd818e95f..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: My -T := Int - -type parameter bounds: -T := Int -P <: My*, <: My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints deleted file mode 100644 index 82eb3f24f17..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: My -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds deleted file mode 100644 index b2bc7a32bd5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: My -T := Int - -type parameter bounds: -T := Int -P >: My*, >: My - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=My diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints deleted file mode 100644 index 579046f1a40..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: My -T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds deleted file mode 100644 index b34161cf868..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := My -T <: Int - -type parameter bounds: -T <: Int -P := My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints deleted file mode 100644 index 77fa46314fd..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := My -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds deleted file mode 100644 index e372a34bd57..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: My -T <: Int - -type parameter bounds: -T <: Int -P <: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints deleted file mode 100644 index 3ec171fd99d..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: My -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds deleted file mode 100644 index 4653442f55e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: My -T <: Int - -type parameter bounds: -T <: Int -P >: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints deleted file mode 100644 index 51521bac5f5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: My -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds deleted file mode 100644 index 327b6bf0f48..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P := My -T >: Int - -type parameter bounds: -T >: Int -P := My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: true --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints deleted file mode 100644 index 855195c6593..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P := My -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds deleted file mode 100644 index d383c9e2f1a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P <: My -T >: Int - -type parameter bounds: -T >: Int -P <: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints deleted file mode 100644 index cb57ae20f53..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P <: My -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds deleted file mode 100644 index fc7d7f74ffe..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -P >: My -T >: Int - -type parameter bounds: -T >: Int -P >: My* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints deleted file mode 100644 index 57f94b389e7..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -P >: My -T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds deleted file mode 100644 index 6be080da490..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds +++ /dev/null @@ -1,23 +0,0 @@ -VARIABLES T P - -T <: Int - -type parameter bounds: -T <: Int -P - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints b/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints deleted file mode 100644 index edc91fdd59c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T P - -T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds b/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds deleted file mode 100644 index 37e1b3e7fb2..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -T := P - -type parameter bounds: -T <: Int, := P* -P <: Int, := T* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints b/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints deleted file mode 100644 index 4a053567d4c..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -T := P diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds deleted file mode 100644 index 6c3855b7725..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -Int <: T -T := P - -type parameter bounds: -T >: Int, := P* -P >: Int, := T* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints deleted file mode 100644 index c048debe4f8..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -Int <: T -T := P diff --git a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds deleted file mode 100644 index 9974df33161..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -T <: P - -type parameter bounds: -T <: Int, <: P* -P >: T* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: true --hasViolatedUpperBound: false --isSuccessful: false - -result: -T=Int -P=??? diff --git a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints deleted file mode 100644 index 990c06be17a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -T <: P diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds deleted file mode 100644 index 1fb55761d4a..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -T <: Int -P <: T - -type parameter bounds: -T <: Int, >: P* -P <: T*, <: Int - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints deleted file mode 100644 index 4c33878795e..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -T <: Int -P <: T diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds deleted file mode 100644 index d74cf43adf5..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds +++ /dev/null @@ -1,24 +0,0 @@ -VARIABLES T P - -Int <: T -T <: P - -type parameter bounds: -T >: Int, <: P* -P >: Int, >: T* - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=Int -P=Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints deleted file mode 100644 index 7953a434603..00000000000 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T P - -Int <: T -T <: P diff --git a/compiler/testData/constraintSystem/variance/consumer.bounds b/compiler/testData/constraintSystem/variance/consumer.bounds deleted file mode 100644 index 485d9e2892f..00000000000 --- a/compiler/testData/constraintSystem/variance/consumer.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -Consumer <: Consumer - -type parameter bounds: -T <: A - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=A diff --git a/compiler/testData/constraintSystem/variance/consumer.constraints b/compiler/testData/constraintSystem/variance/consumer.constraints deleted file mode 100644 index 7c8111bd7cb..00000000000 --- a/compiler/testData/constraintSystem/variance/consumer.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T - -Consumer <: Consumer diff --git a/compiler/testData/constraintSystem/variance/invariant.bounds b/compiler/testData/constraintSystem/variance/invariant.bounds deleted file mode 100644 index 414e0c2082e..00000000000 --- a/compiler/testData/constraintSystem/variance/invariant.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -My <: My - -type parameter bounds: -T := A - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=A diff --git a/compiler/testData/constraintSystem/variance/invariant.constraints b/compiler/testData/constraintSystem/variance/invariant.constraints deleted file mode 100644 index 239de367350..00000000000 --- a/compiler/testData/constraintSystem/variance/invariant.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T - -My <: My diff --git a/compiler/testData/constraintSystem/variance/producer.bounds b/compiler/testData/constraintSystem/variance/producer.bounds deleted file mode 100644 index 9ed9daad72d..00000000000 --- a/compiler/testData/constraintSystem/variance/producer.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -Producer <: Producer - -type parameter bounds: -T >: A - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: false --hasContradiction: false --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasTypeParameterWithUnsatisfiedOnlyInputTypesError: false --hasUnknownParameters: false --hasViolatedUpperBound: false --isSuccessful: true - -result: -T=A diff --git a/compiler/testData/constraintSystem/variance/producer.constraints b/compiler/testData/constraintSystem/variance/producer.constraints deleted file mode 100644 index a9efb4e6e39..00000000000 --- a/compiler/testData/constraintSystem/variance/producer.constraints +++ /dev/null @@ -1,3 +0,0 @@ -VARIABLES T - -Producer <: Producer diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt deleted file mode 100644 index 90e370d7463..00000000000 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.resolve.constraintSystem - -import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.diagnostics.rendering.Renderers -import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.kotlin.resolve.TypeResolver -import org.jetbrains.kotlin.resolve.calls.inference.CallHandle -import org.jetbrains.kotlin.resolve.calls.inference.ConstraintContext -import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilderImpl -import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.SPECIAL -import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil -import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.test.KotlinTestWithEnvironment -import org.jetbrains.kotlin.test.util.KtTestUtil -import org.jetbrains.kotlin.tests.di.createContainerForTests -import org.jetbrains.kotlin.types.error.ErrorUtils -import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.types.Variance -import java.io.File - -abstract class AbstractConstraintSystemTest : KotlinTestWithEnvironment() { - private var _typeResolver: TypeResolver? = null - private val typeResolver: TypeResolver - get() = _typeResolver!! - - private var _testDeclarations: ConstraintSystemTestData? = null - private val testDeclarations: ConstraintSystemTestData - get() = _testDeclarations!! - - override fun createEnvironment(): KotlinCoreEnvironment { - return createEnvironmentWithMockJdk(ConfigurationKind.ALL) - } - - override fun setUp() { - super.setUp() - - _typeResolver = createContainerForTests(project, KotlinTestUtils.createEmptyModule()).typeResolver - _testDeclarations = analyzeDeclarations() - } - - override fun tearDown() { - _typeResolver = null - _testDeclarations = null - super.tearDown() - } - - private val testDataPath: String - get() = KtTestUtil.getTestDataPathBase() + "/constraintSystem/" - - private fun analyzeDeclarations(): ConstraintSystemTestData { - val fileName = "declarations.kt" - - val psiFile = KtTestUtil.createFile( - fileName, - KtTestUtil.doLoadFile(testDataPath, fileName), - project - ) - val bindingContext = JvmResolveUtil.analyzeAndCheckForErrors(psiFile, environment).bindingContext - return ConstraintSystemTestData(bindingContext, project, typeResolver) - } - - fun doTest(filePath: String) { - val constraintsFile = File(filePath) - val constraintsFileText = constraintsFile.readLines() - - val builder = ConstraintSystemBuilderImpl() - - val variables = parseVariables(constraintsFileText) - val fixVariables = constraintsFileText.contains("FIX_VARIABLES") - val typeParameterDescriptors = variables.map { testDeclarations.getParameterDescriptor(it) } - val substitutor = builder.registerTypeVariables(CallHandle.NONE, typeParameterDescriptors) - - val constraints = parseConstraints(constraintsFileText) - - fun getType(typeString: String): KotlinType { - val type = testDeclarations.getType(typeString).apply { - assert(!ErrorUtils.containsErrorType(this)) { "Type $this is resolved to or contains error type" } - } - return substitutor.substitute(type, Variance.INVARIANT) ?: error("Failed to substitute $type") - } - - for (constraint in constraints) { - val firstType = getType(constraint.firstType) - val secondType = getType(constraint.secondType) - val context = ConstraintContext(SPECIAL.position(), initial = true, initialReduction = true) - when (constraint.kind) { - MyConstraintKind.SUBTYPE -> builder.addSubtypeConstraint(firstType, secondType, context.position) - MyConstraintKind.SUPERTYPE -> builder.addSubtypeConstraint(secondType, firstType, context.position) - MyConstraintKind.EQUAL -> builder.addConstraint( - ConstraintSystemBuilderImpl.ConstraintKind.EQUAL, firstType, secondType, context - ) - } - } - - if (fixVariables) builder.fixVariables() - - val system = builder.build() - - val resultingStatus = Renderers.renderConstraintSystem(system, Renderers.ConstraintSystemRenderingVerbosity.COMPACT) - - val resultingSubstitutor = system.resultingSubstitutor - val result = typeParameterDescriptors.map { - val parameterType = testDeclarations.getType(it.name.asString()) - val resultType = resultingSubstitutor.substitute(parameterType, Variance.INVARIANT) - "${it.name}=${resultType?.let { DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it) }}" - }.joinToString("\n", prefix = "result:\n") - - val boundsFile = File(filePath.replace("constraints", "bounds")) - KotlinTestUtils.assertEqualsToFile(boundsFile, "${constraintsFileText.joinToString("\n")}\n\n$resultingStatus\n\n$result") - } - - class MyConstraint(val kind: MyConstraintKind, val firstType: String, val secondType: String) - enum class MyConstraintKind(val token: String) { - SUBTYPE("<:"), SUPERTYPE(">:"), EQUAL(":=") - } - - private fun parseVariables(lines: List): List { - val first = lines.first() - val variablesString = "VARIABLES " - assert (first.startsWith(variablesString)) { "The first line should contain variables: $first"} - val variables = first.substringAfter(variablesString).split(' ') - return variables.toList() - } - - private fun parseConstraints(lines: List): List { - val kindsMap = MyConstraintKind.values().map { it.token to it }.toMap() - val kinds = kindsMap.keys - val linesWithConstraints = lines.filter { line -> kinds.any { kind -> line.contains(kind) } } - return linesWithConstraints.map { - line -> - val kind = kinds.first { line.contains(it) } - val firstType = line.substringBefore(kind).trim() - val secondType = line.substringAfter(kind).trim() - MyConstraint(kindsMap[kind]!!, firstType, secondType) - } - } -} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt deleted file mode 100644 index 8467b67cea5..00000000000 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.resolve.constraintSystem - -import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.kotlin.psi.KtFunction -import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.kotlin.resolve.TypeResolver -import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant -import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor -import org.jetbrains.kotlin.resolve.descriptorUtil.module -import org.jetbrains.kotlin.resolve.scopes.LexicalScope -import org.jetbrains.kotlin.resolve.scopes.MemberScope -import org.jetbrains.kotlin.test.DummyTraces -import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.types.KotlinTypeFactory -import org.jetbrains.kotlin.types.TypeAttributes -import java.util.regex.Pattern - -class ConstraintSystemTestData( - context: BindingContext, - private val project: Project, - private val typeResolver: TypeResolver -) { - private val functionFoo: FunctionDescriptor - private val scopeToResolveTypeParameters: LexicalScope - - init { - val functions = context.getSliceContents(BindingContext.FUNCTION) - functionFoo = findFunctionByName(functions.values, "foo") - val function = DescriptorToSourceUtils.descriptorToDeclaration(functionFoo) as KtFunction - val fooBody = function.bodyExpression - scopeToResolveTypeParameters = context.get(BindingContext.LEXICAL_SCOPE, fooBody)!! - } - - private fun findFunctionByName(functions: Collection, name: String): FunctionDescriptor { - return functions.firstOrNull { it.name.asString() == name } ?: - throw AssertionError("Function ${name} is not declared") - } - - fun getParameterDescriptor(name: String): TypeParameterDescriptor { - return functionFoo.typeParameters.firstOrNull { it.name.asString() == name } ?: - throw AssertionError("Unsupported type parameter name: $name. You may add it to constraintSystem/declarations.kt") - } - - fun getType(name: String): KotlinType { - val matcher = INTEGER_VALUE_TYPE_PATTERN.matcher(name) - if (matcher.find()) { - val number = matcher.group(1)!! - val parameters = CompileTimeConstant.Parameters(false, false, false, false, false, false, false, false) - return KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope( - TypeAttributes.Empty, - IntegerValueTypeConstructor(number.toLong(), functionFoo.module, parameters), - listOf(), - false, - MemberScope.Empty - ) - } - return typeResolver.resolveType( - scopeToResolveTypeParameters, KtPsiFactory(project).createType(name), - DummyTraces.DUMMY_TRACE, true) - } -} - -private val INTEGER_VALUE_TYPE_PATTERN = Pattern.compile("""IntegerValueType\((\d*)\)""") diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt index 5fe442597dc..3e8ff5ea3ea 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt @@ -47,7 +47,6 @@ import org.jetbrains.kotlin.repl.AbstractReplInterpreterTest import org.jetbrains.kotlin.resolve.AbstractResolveTest import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests -import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.types.AbstractTypeBindingTest @@ -75,10 +74,6 @@ fun generateJUnit3CompilerTests(args: Array) { model("resolveConstructorDelegationCalls") } - testClass { - model("constraintSystem", extension = "constraints") - } - testClass { model("psi", testMethod = "doParsingTest", pattern = "^(.*)\\.kts?$") model("parseCodeFragment/expression", testMethod = "doExpressionCodeFragmentParsingTest", extension = "kt") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java deleted file mode 100644 index f60d3787d1a..00000000000 --- a/compiler/tests-gen/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java +++ /dev/null @@ -1,916 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.resolve.constraintSystem; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/constraintSystem") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInConstraintSystem() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("compiler/testData/constraintSystem/checkStatus") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CheckStatus extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCheckStatus() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/checkStatus"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("conflictingConstraints.constraints") - public void testConflictingConstraints() throws Exception { - runTest("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints"); - } - - @TestMetadata("successful.constraints") - public void testSuccessful() throws Exception { - runTest("compiler/testData/constraintSystem/checkStatus/successful.constraints"); - } - - @TestMetadata("typeConstructorMismatch.constraints") - public void testTypeConstructorMismatch() throws Exception { - runTest("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints"); - } - - @TestMetadata("unknownParameters.constraints") - public void testUnknownParameters() throws Exception { - runTest("compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/computeValues") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ComputeValues extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInComputeValues() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/computeValues"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("contradiction.constraints") - public void testContradiction() throws Exception { - runTest("compiler/testData/constraintSystem/computeValues/contradiction.constraints"); - } - - @TestMetadata("subTypeOfUpperBounds.constraints") - public void testSubTypeOfUpperBounds() throws Exception { - runTest("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints"); - } - - @TestMetadata("superTypeOfLowerBounds1.constraints") - public void testSuperTypeOfLowerBounds1() throws Exception { - runTest("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints"); - } - - @TestMetadata("superTypeOfLowerBounds2.constraints") - public void testSuperTypeOfLowerBounds2() throws Exception { - runTest("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/integerValueTypes") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class IntegerValueTypes extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInIntegerValueTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/integerValueTypes"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("byteOverflow.constraints") - public void testByteOverflow() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints"); - } - - @TestMetadata("defaultLong.constraints") - public void testDefaultLong() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints"); - } - - @TestMetadata("numberAndAny.constraints") - public void testNumberAndAny() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints"); - } - - @TestMetadata("numberAndString.constraints") - public void testNumberAndString() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints"); - } - - @TestMetadata("severalNumbers.constraints") - public void testSeveralNumbers() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints"); - } - - @TestMetadata("simpleByte.constraints") - public void testSimpleByte() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints"); - } - - @TestMetadata("simpleInt.constraints") - public void testSimpleInt() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints"); - } - - @TestMetadata("simpleShort.constraints") - public void testSimpleShort() throws Exception { - runTest("compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class SeveralVariables extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInSeveralVariables() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("simpleDependency.constraints") - public void testSimpleDependency() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints"); - } - - @TestMetadata("simpleEquality.constraints") - public void testSimpleEquality() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints"); - } - - @TestMetadata("simpleEquality1.constraints") - public void testSimpleEquality1() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints"); - } - - @TestMetadata("simpleReversedDependency.constraints") - public void testSimpleReversedDependency() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints"); - } - - @TestMetadata("simpleSubtype.constraints") - public void testSimpleSubtype() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints"); - } - - @TestMetadata("simpleSubtype1.constraints") - public void testSimpleSubtype1() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints"); - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/direct") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Direct extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInDirect() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Contravariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInContravariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/contravariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Covariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCovariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/covariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Invariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInInvariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/invariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints"); - } - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/interdependency") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Interdependency extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInInterdependency() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/interdependency"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("interdependency1.constraints") - public void testInterdependency1() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints"); - } - - @TestMetadata("interdependency2.constraints") - public void testInterdependency2() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints"); - } - - @TestMetadata("interdependency3.constraints") - public void testInterdependency3() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/nullable") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Nullable extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInNullable() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Contravariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInContravariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/contravariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Covariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCovariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/covariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Invariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInInvariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/invariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints"); - } - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/other") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Other extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInOther() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/other"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("constraintForNullables.constraints") - public void testConstraintForNullables() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints"); - } - - @TestMetadata("nestedConsumer.constraints") - public void testNestedConsumer() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints"); - } - - @TestMetadata("nestedConsumer1.constraints") - public void testNestedConsumer1() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints"); - } - - @TestMetadata("nestedInvConsumer.constraints") - public void testNestedInvConsumer() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints"); - } - - @TestMetadata("nestedInvProducer.constraints") - public void testNestedInvProducer() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints"); - } - - @TestMetadata("nestedProducer.constraints") - public void testNestedProducer() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints"); - } - - @TestMetadata("nestedProducerAndConsumer.constraints") - public void testNestedProducerAndConsumer() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints"); - } - - @TestMetadata("severalOccurrences.constraints") - public void testSeveralOccurrences() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints"); - } - - @TestMetadata("simpleFun.constraints") - public void testSimpleFun() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints"); - } - - @TestMetadata("simpleThreeVars.constraints") - public void testSimpleThreeVars() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints"); - } - - @TestMetadata("simpleThreeVarsNoIncorporation.constraints") - public void testSimpleThreeVarsNoIncorporation() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints"); - } - - @TestMetadata("simpleThreeVarsNoIncorporationFixed.constraints") - public void testSimpleThreeVarsNoIncorporationFixed() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/recursive") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Recursive extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInRecursive() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/recursive"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("implicitlyRecursive.constraints") - public void testImplicitlyRecursive() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints"); - } - - @TestMetadata("kt8879.constraints") - public void testKt8879() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints"); - } - - @TestMetadata("mutuallyRecursive.constraints") - public void testMutuallyRecursive() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints"); - } - - @TestMetadata("simpleRecursive.constraints") - public void testSimpleRecursive() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/reversed") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Reversed extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInReversed() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Contravariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInContravariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/contravariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Covariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInCovariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/covariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints"); - } - } - - @TestMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Invariant extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInInvariant() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/invariant"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("varEqDepEq.constraints") - public void testVarEqDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints"); - } - - @TestMetadata("varEqDepSub.constraints") - public void testVarEqDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints"); - } - - @TestMetadata("varEqDepSuper.constraints") - public void testVarEqDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints"); - } - - @TestMetadata("varSubDepEq.constraints") - public void testVarSubDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints"); - } - - @TestMetadata("varSubDepSub.constraints") - public void testVarSubDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints"); - } - - @TestMetadata("varSubDepSuper.constraints") - public void testVarSubDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints"); - } - - @TestMetadata("varSuperDepEq.constraints") - public void testVarSuperDepEq() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints"); - } - - @TestMetadata("varSuperDepSub.constraints") - public void testVarSuperDepSub() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints"); - } - - @TestMetadata("varSuperDepSuper.constraints") - public void testVarSuperDepSuper() throws Exception { - runTest("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints"); - } - } - } - } - - @TestMetadata("compiler/testData/constraintSystem/variance") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Variance extends AbstractConstraintSystemTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInVariance() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/constraintSystem/variance"), Pattern.compile("^(.+)\\.constraints$"), null, true); - } - - @TestMetadata("consumer.constraints") - public void testConsumer() throws Exception { - runTest("compiler/testData/constraintSystem/variance/consumer.constraints"); - } - - @TestMetadata("invariant.constraints") - public void testInvariant() throws Exception { - runTest("compiler/testData/constraintSystem/variance/invariant.constraints"); - } - - @TestMetadata("producer.constraints") - public void testProducer() throws Exception { - runTest("compiler/testData/constraintSystem/variance/producer.constraints"); - } - } -}