From d2825155e64afe7dbfec9822edebcf43deae461f Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 15 Jul 2021 13:56:13 -0700 Subject: [PATCH 1/2] Minor test namespace --- .../CompilerOptions/fsc/noframework.fs | 4 ++-- .../CompilerOptions/fsc/platform.fs | 4 ++-- .../CompilerOptions/fsc/times.fs | 4 ++-- .../CompilerOptions/fsc/warn.fs | 4 ++-- .../CompilerOptions/fsc/warnon.fs | 4 ++-- .../BasicTypeAndModuleDefinitions/RecordTypes.fs | 4 ++-- .../BasicTypeAndModuleDefinitions/UnionTypes.fs | 4 ++-- .../LetBindings/TypeFunctions.fs | 4 ++-- .../LetBindings/UseBindings.fs | 4 ++-- .../ApplicationExpressions/BasicApplication.fs | 4 ++-- .../ControlFlowExpressions/PatternMatching.fs | 4 ++-- .../ControlFlowExpressions/SequenceIteration.fs | 4 ++-- .../Expressions/Type-relatedExpressions.fs | 4 ++-- .../RecursiveSafetyAnalysis.fs | 4 ++-- .../Conformance/LexicalAnalysis/Comments.fs | 4 ++-- .../LexicalAnalysis/NumericLiterals.fs | 4 ++-- .../Conformance/LexicalAnalysis/Shift/Generics.fs | 4 ++-- .../LexicalAnalysis/SymbolicKeywords.fs | 4 ++-- .../LexicalAnalysis/SymbolicOperators.fs | 4 ++-- .../LexicalFiltering/Basic/OffsideExceptions.fs | 4 ++-- .../Conformance/LexicalFiltering/HashLight.fs | 4 ++-- .../LexicalFiltering/HighPrecedenceApplication.fs | 4 ++-- .../ClassTypes/ExplicitObjectConstructors.fs | 4 ++-- .../ClassTypes/ImplicitObjectConstructors.fs | 4 ++-- .../ClassTypes/ValueRestriction.fs | 4 ++-- .../ObjectOrientedTypeDefinitions/StructTypes.fs | 4 ++-- .../Conformance/PatternMatching/Simple.fs | 4 ++-- .../CheckingSyntacticTypes.fs | 4 ++-- .../LogicalPropertiesOfTypes.fs | 4 ++-- .../Conformance/UnitsOfMeasure/Basic.fs | 4 ++-- .../Conformance/UnitsOfMeasure/Diagnostics.fs | 4 ++-- .../Conformance/UnitsOfMeasure/Parsing.fs | 4 ++-- .../Conformance/UnitsOfMeasure/TypeChecker.fs | 4 ++-- .../ConstraintSolver/MemberConstraints.fs | 2 +- .../ConstraintSolver/PrimitiveConstraints.fs | 4 ++-- .../Diagnostics/General.fs | 4 ++-- .../Diagnostics/async.fs | 4 ++-- .../EmittedIL/Literals.fs | 2 +- .../EmittedIL/Misc.fs | 2 +- .../EmittedIL/Operators.fs | 4 ++-- .../EmittedIL/SkipLocalsInit.fs | 2 +- .../EmittedIL/StringFormatAndInterpolation.fs | 2 +- .../EmittedIL/TailCalls.fs | 2 +- .../EmittedIL/TupleElimination.fs | 2 +- .../AccessOfTypeAbbreviationTests.fs | 2 +- .../ErrorMessages/AssignmentErrorTests.fs | 2 +- .../ErrorMessages/ClassesTests.fs | 2 +- .../ErrorMessages/ConfusingTypeName.fs | 2 +- .../ErrorMessages/ConstructorTests.fs | 2 +- .../ErrorMessages/DontSuggestTests.fs | 2 +- .../ErrorMessages/ElseBranchHasWrongTypeTests.fs | 2 +- .../ErrorMessages/InvalidLiteralTests.fs | 2 +- .../ErrorMessages/InvalidNumericLiteralTests.fs | 4 ++-- .../ErrorMessages/MissingElseBranch.fs | 2 +- .../ErrorMessages/MissingExpressionTests.fs | 2 +- .../ErrorMessages/ModuleTests.fs | 2 +- .../ErrorMessages/NameResolutionTests.fs | 2 +- .../ErrorMessages/SuggestionsTests.fs | 2 +- .../ErrorMessages/TypeEqualsMissingTests.fs | 2 +- .../ErrorMessages/TypeMismatchTests.fs | 2 +- .../ErrorMessages/UnitGenericAbstactType.fs | 2 +- .../ErrorMessages/UnsupportedAttributes.fs | 2 +- .../ErrorMessages/UpcastDowncastTests.fs | 2 +- .../ErrorMessages/WarnExpressionTests.fs | 2 +- .../ErrorMessages/WrongSyntaxInForLoop.fs | 2 +- .../Interop/SimpleInteropTests.fs | 2 +- .../Interop/VisibilityTests.fs | 2 +- .../Language/AttributeCheckingTests.fs | 2 +- .../Language/CastingTests.fs | 2 +- .../Language/CodeQuotationTests.fs | 2 +- .../Language/CompilerDirectiveTests.fs | 2 +- .../Language/ComputationExpressionTests.fs | 2 +- .../Language/RegressionTests.fs | 2 +- .../Language/XmlComments.fs | 2 +- .../OCamlCompat/OCamlCompat.fs | 4 ++-- .../Scripting/Interactive.fs | 2 +- .../TypeChecks/CheckDeclarationsTests.fs | 4 ++-- .../AssemblySigningAttributes.fs | 6 +++--- tests/FSharp.Compiler.UnitTests/BlockTests.fs | 2 +- .../FSharp.Compiler.UnitTests/BuildGraphTests.fs | 3 ++- .../FSharp.Compiler.UnitTests/ByteMemoryTests.fs | 2 +- tests/FSharp.Compiler.UnitTests/EditDistance.fs | 2 +- tests/FSharp.Compiler.UnitTests/FsiTests.fs | 2 +- .../FSharp.Compiler.UnitTests/HashIfExpression.fs | 2 +- .../ManglingNameOfProvidedTypes.fs | 1 + tests/FSharp.Compiler.UnitTests/ProductVersion.fs | 2 +- .../FSharp.Compiler.UnitTests/SuggestionBuffer.fs | 3 +-- tests/FSharp.Test.Utilities/Assert.fs | 2 +- tests/FSharp.Test.Utilities/Compiler.fs | 5 ++--- tests/FSharp.Test.Utilities/CompilerAssert.fs | 4 ++-- tests/FSharp.Test.Utilities/ILChecker.fs | 2 +- tests/FSharp.Test.Utilities/TestFramework.fs | 1 - tests/FSharp.Test.Utilities/Utilities.fs | 5 +++-- .../Xunit/Attributes/DirectoryAttribute.fs | 6 +++--- .../Compiler/CodeGen/EmittedIL/BooleanLogic.fs | 2 +- .../Compiler/CodeGen/EmittedIL/CeEdiThrow.fs | 2 +- .../CodeGen/EmittedIL/ComputedListExpressions.fs | 2 +- .../fsharp/Compiler/CodeGen/EmittedIL/Mutation.fs | 2 +- .../Compiler/CodeGen/EmittedIL/StaticLinkTests.fs | 2 +- .../Compiler/CodeGen/EmittedIL/StaticMember.fs | 2 +- .../BasicGrammarElements/BasicConstants.fs | 2 +- .../DataExpressions/ComputationExpressions.fs | 2 +- .../fsharp/Compiler/Infrastructure/AstCompiler.fs | 2 +- tests/fsharp/Compiler/Language/AnonRecordTests.fs | 2 +- tests/fsharp/Compiler/Language/ByrefTests.fs | 6 ++---- .../Compiler/Language/CompilerDirectiveTests.fs | 2 +- .../Language/ComputationExpressionTests.fs | 2 +- .../Compiler/Language/CustomCollectionTests.fs | 2 +- .../Language/DefaultInterfaceMemberTests.fs | 2 +- .../Compiler/Language/FixedIndexSliceTests.fs | 2 +- .../Compiler/Language/HatDesugaringTests.fs | 2 +- .../Language/InitOnlyPropertyConsumptionTests.fs | 5 ++--- tests/fsharp/Compiler/Language/InterfaceTests.fs | 1 - .../Compiler/Language/OpenTypeDeclarationTests.fs | 15 +++++++-------- .../Compiler/Language/OptionalInteropTests.fs | 4 ++-- .../Compiler/Language/SlicingQuotationTests.fs | 2 +- .../Compiler/Language/SpanOptimizationTests.fs | 2 +- tests/fsharp/Compiler/Language/SpanTests.fs | 2 +- .../Language/StringConcatOptimizationTests.fs | 2 +- .../Compiler/Language/StringInterpolation.fs | 2 +- .../Compiler/Language/StructActivePatternTests.fs | 2 +- .../Compiler/Language/TypeAttributeTests.fs | 2 +- tests/fsharp/Compiler/Language/UIntTests.fs | 2 +- tests/fsharp/Compiler/Language/WitnessTests.fs | 7 ++++--- .../Libraries/Core/Collections/ListTests.fs | 2 +- .../ExtraTopLevelOperators/DictionaryTests.fs | 2 +- .../Core/LanguagePrimitives/CastToUnitsTests.fs | 2 +- .../Core/LanguagePrimitives/ComparisonTests.fs | 2 +- .../Core/LanguagePrimitives/StringFormatTests.fs | 2 +- .../Core/NativeInterop/StackallocTests.fs | 2 +- .../Compiler/Libraries/Core/Operators/AbsTests.fs | 2 +- .../Libraries/Core/Operators/CastTests.fs | 2 +- .../Libraries/Core/Operators/HashTests.fs | 2 +- .../Libraries/Core/Operators/SignTests.fs | 2 +- .../Regressions/ForInDoMutableRegressionTest.fs | 2 +- .../Regressions/IndexerRegressionTests.fs | 2 +- .../NullableOptionalRegressionTests.fs | 2 +- .../fsharp/Compiler/Service/MultiProjectTests.fs | 5 ++--- .../Compiler/Service/SignatureGenerationTests.fs | 5 ++--- tests/fsharp/Compiler/Stress/LargeExprTests.fs | 2 +- .../Compiler/Warnings/AssignmentWarningTests.fs | 2 +- .../Warnings/ExperimentalAttributeTests.fs | 2 +- .../Warnings/PatternMatchingWarningTests.fs | 2 +- tests/fsharp/TypeProviderTests.fs | 2 +- tests/fsharp/tests.fs | 3 ++- 145 files changed, 207 insertions(+), 212 deletions(-) diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework.fs index e52b1f858d..6896ac69cf 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/noframework.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module noframework = diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform.fs index 74dd2b054b..3b5950cf38 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/platform.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module platform = diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times.fs index 229b1ecf77..37d7ac658e 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/times.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module times = diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn.fs index 764bed584e..48061544e8 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warn.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module warn = diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon.fs index 7200cb0a15..194c2036e0 100644 --- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon.fs +++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/warnon.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.CompilerOptions.fsc open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module warnon = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/RecordTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/RecordTypes.fs index 14f887532e..ec1f6a722c 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/RecordTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/RecordTypes.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module RecordTypes = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/UnionTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/UnionTypes.fs index fb70f58977..d2ee668761 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/UnionTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicTypeAndModuleDefinitions/UnionTypes.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.BasicTypeAndModuleDefinitions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module UnionTypes = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions.fs index 1ec68ea6bf..d21051f861 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/TypeFunctions.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.LetBindings open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module TypeFunctions = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/UseBindings.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/UseBindings.fs index 7cabf8b5e2..05aebe0131 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/UseBindings.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/LetBindings/UseBindings.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.DeclarationElements.LetBindings open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module UseBindings = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication.fs index e1022ab2d4..e6b9712878 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ApplicationExpressions/BasicApplication.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.Expressions.ApplicationExpressions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module BasicApplication = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching.fs index ad453ce8e4..aac0747b6f 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/PatternMatching.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.Expressions.ControlFlowExpressions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module PatternMatching = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration.fs index f78d51c039..6c02b2e15c 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/ControlFlowExpressions/SequenceIteration.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.Expressions.ControlFlowExpressions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module SequenceIteration = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/Type-relatedExpressions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/Type-relatedExpressions.fs index 4887c3bdec..374e6b4979 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/Type-relatedExpressions.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/Expressions/Type-relatedExpressions.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.Expressions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module TyperelatedExpressions = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis.fs index 9e62e06049..8a3c6ca092 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/InferenceProcedures/RecursiveSafetyAnalysis.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.InferenceProcedures open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module RecursiveSafetyAnalysis = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs index 534315b52f..0410f5cc3e 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Comments.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Comments = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs index 8139f26d2e..6d654432ec 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/NumericLiterals.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module NumericLiterals = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs index 8d9462dcf6..1196518ca0 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/Shift/Generics.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis.Shift open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Generics = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs index b73275378c..0c4095e15f 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicKeywords.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module SymbolicKeywords = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs index 948fdfe463..1c9eccdf01 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalAnalysis open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module SymbolicOperators = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/Basic/OffsideExceptions.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/Basic/OffsideExceptions.fs index 1ca4583fa3..343bf9278b 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/Basic/OffsideExceptions.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/Basic/OffsideExceptions.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering.Basic open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module OffsideExceptions = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight.fs index 4c1e90115e..1d1b1b0c82 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HashLight.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module HashLight = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication.fs index 191f4ef620..738aa01e10 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/HighPrecedenceApplication.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module HighPrecedenceApplication = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ExplicitObjectConstructors.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ExplicitObjectConstructors.fs index 1ed2ce05d7..72cc5fdf66 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ExplicitObjectConstructors.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ExplicitObjectConstructors.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.ObjectOrientedTypeDefinitions.ClassTypes open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module ExplicitObjectConstructors = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ImplicitObjectConstructors.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ImplicitObjectConstructors.fs index a5e58a018e..a8e9cd5004 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ImplicitObjectConstructors.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ImplicitObjectConstructors.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.ObjectOrientedTypeDefinitions.ClassTypes open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module ImplicitObjectConstructors = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ValueRestriction.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ValueRestriction.fs index e1cc954cf6..de513935d5 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ValueRestriction.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/ValueRestriction.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.ObjectOrientedTypeDefinitions.ClassTypes open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module ValueRestriction = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/StructTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/StructTypes.fs index ae5cdb7422..03b071572e 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/StructTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/ObjectOrientedTypeDefinitions/StructTypes.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.ObjectOrientedTypeDefinitions open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module StructTypes = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs index 62eeaf555f..1f98b0a96d 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/PatternMatching/Simple.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.PatternMatching open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Simple = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes.fs index ab45cbb081..e6813ecf1b 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/CheckingSyntacticTypes.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.TypesAndTypeConstraints open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module CheckingSyntacticTypes = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes.fs index a69052c3e6..ddf8f623d9 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/TypesAndTypeConstraints/LogicalPropertiesOfTypes.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.TypesAndTypeConstraints open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module LogicalPropertiesOfTypes = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs index b4d3a58d83..a926fc8f13 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Basic.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Basic = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs index cf9582618c..e0ae16cf12 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Diagnostics.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Diagnostics = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs index d6e0ac1617..c4a4596685 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/Parsing.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Parsing = diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs index 9c265230fc..8b3d372a79 100644 --- a/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs +++ b/tests/FSharp.Compiler.ComponentTests/Conformance/UnitsOfMeasure/TypeChecker.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Conformance.UnitsOfMeasure open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module TypeChecker = diff --git a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs index fdb999aae6..91fe159153 100644 --- a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs +++ b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/MemberConstraints.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ConstraintSolver open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module MemberConstraints = diff --git a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs index a366074e20..cf1a672369 100644 --- a/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs +++ b/tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.ConstraintSolver open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module PrimitiveConstraints = diff --git a/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs b/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs index 0502e22328..295204c1ce 100644 --- a/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs +++ b/tests/FSharp.Compiler.ComponentTests/Diagnostics/General.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Diagnostics open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module General = diff --git a/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs b/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs index ffcea4feb3..2c52972d2c 100644 --- a/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs +++ b/tests/FSharp.Compiler.ComponentTests/Diagnostics/async.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.Diagnostics open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module async = diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs index 880c131a19..40092066b3 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Literals.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Literals`` = diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc.fs index 88410a24e1..e54703e961 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Misc`` = [] diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Operators.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Operators.fs index d642f5e856..a0224fad56 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/Operators.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/Operators.fs @@ -2,8 +2,8 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module Operators = diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs index cd484f2cfe..d544eb3298 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/SkipLocalsInit.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler #if NETCOREAPP module ``SkipLocalsInit`` = diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs index 716568cf83..9734e06935 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/StringFormatAndInterpolation.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``StringFormatAndInterpolation`` = [] diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs index e52d32d4ad..2e37d06e92 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TailCalls.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Tail Calls`` = // Regression test for DevDiv:72571 diff --git a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs index a83e71a196..38a86274de 100644 --- a/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs +++ b/tests/FSharp.Compiler.ComponentTests/EmittedIL/TupleElimination.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``TupleElimination`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs index 623244da2f..758ef24208 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AccessOfTypeAbbreviationTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler open FSharp.Compiler.Diagnostics module ``Access Of Type Abbreviation`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs index dd986cf500..cd7265df82 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/AssignmentErrorTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Errors assigning to mutable objects`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs index e1941a3d7e..11e2efef68 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ClassesTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Classes`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs index 4e56519ffa..3bdd41b979 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConfusingTypeName.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Confusing Type Name`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs index 5b0c17da33..2c59176244 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Constructor`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs index d1511da554..c65b02db61 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/DontSuggestTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Don't Suggest`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs index e986cc6b72..439ada429c 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ElseBranchHasWrongTypeTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Else branch has wrong type`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs index fb44f2b717..bf6630b431 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidLiteralTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Invalid literals`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs index caf05fb29e..90cf5dd9db 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/InvalidNumericLiteralTests.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities -open FSharp.Test.Utilities.Compiler +open FSharp.Test +open FSharp.Test.Compiler open FSharp.Compiler.Diagnostics open FSharp.Compiler.AbstractIL diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs index 07a40b5c9a..ca414c212b 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingElseBranch.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Else branch is missing`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs index f91d8b3d68..ec18fb6152 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/MissingExpressionTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Missing Expression`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs index f96f59a9ce..f664c614de 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ModuleTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module Modules = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs index 016bbdcadc..74f62a1c3b 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/NameResolutionTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module NameResolutionTests = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs index abdc7b92ca..85a5dbf6db 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/SuggestionsTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module Suggestions = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs index 63a16ff2a7..3dacfbfde6 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs index 0d2d1152c8..4326a4a2a3 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeMismatchTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Type Mismatch`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs index 2b244e1215..1591220d02 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnitGenericAbstactType.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Unit generic abstract Type`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs index ed112bac76..439b0bd7bd 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UnsupportedAttributes.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages #if NETCOREAPP open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Unsupported Attributes`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs index 61fcaadf12..e336d7b10a 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/UpcastDowncastTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Upcast and Downcast`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs index 1380869d38..3e7768efb9 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WarnExpressionTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Warn Expression`` = diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs index 89e3707c24..037624160a 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/WrongSyntaxInForLoop.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Wrong syntax in for loop`` = diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs b/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs index 2d1b2e0fcb..a2a018a64b 100644 --- a/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Interop/SimpleInteropTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.Interop open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Simple interop verification`` = diff --git a/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs b/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs index 4563644abd..ab6425d205 100644 --- a/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Interop/VisibilityTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.ComponentTests.Interop open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Verify visibility of properties`` = diff --git a/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs index 20b75ea9a3..7b94f335e5 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/AttributeCheckingTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.AttributeChecking open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module AttributeCheckingTests = diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs index eea1385a6a..c85c571d0f 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/CastingTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module CastingTests = diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs index ca49fdfa13..45ab067852 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.Language open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler open FSharp.Quotations.Patterns module CodeQuotationsTests = diff --git a/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs index 0237a6d4d8..362e6f06c6 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/CompilerDirectiveTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.Language open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Test Compiler Directives`` = diff --git a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs index 95f036d4ca..52a4ccabe4 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/ComputationExpressionTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.Language open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ComputationExpressionTests = [] diff --git a/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs b/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs index 4e878fddae..81e5515878 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/RegressionTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.Language open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module RegressionTests = diff --git a/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs b/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs index c1caf71561..fc554d1fcc 100644 --- a/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs +++ b/tests/FSharp.Compiler.ComponentTests/Language/XmlComments.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.XmlComments open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module XmlCommentChecking = diff --git a/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs b/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs index 774d2085b1..86c45c9556 100644 --- a/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs +++ b/tests/FSharp.Compiler.ComponentTests/OCamlCompat/OCamlCompat.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.OCamlCompat open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module OCamlCompat = diff --git a/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs b/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs index a1eb8fa884..efdd5918cb 100644 --- a/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs +++ b/tests/FSharp.Compiler.ComponentTests/Scripting/Interactive.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.ComponentTests.Scripting open Xunit -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler module ``Interactive tests`` = [] diff --git a/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs b/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs index 9330c00748..636c9d31dd 100644 --- a/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/TypeChecks/CheckDeclarationsTests.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.ComponentTests.CheckDeclarationsTests open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module CheckDeclarationsTests = diff --git a/tests/FSharp.Compiler.UnitTests/AssemblySigningAttributes.fs b/tests/FSharp.Compiler.UnitTests/AssemblySigningAttributes.fs index 450c3b771d..333dd3c6a9 100644 --- a/tests/FSharp.Compiler.UnitTests/AssemblySigningAttributes.fs +++ b/tests/FSharp.Compiler.UnitTests/AssemblySigningAttributes.fs @@ -3,9 +3,9 @@ namespace FSharp.Compiler.UnitTests open Xunit -open FSharp.Test.Utilities.Compiler -open FSharp.Test.Utilities.Xunit.Attributes -open FSharp.Test.Utilities +open FSharp.Test +open FSharp.Test.Compiler +open FSharp.Test.Xunit.Attributes module AssemblySigning = diff --git a/tests/FSharp.Compiler.UnitTests/BlockTests.fs b/tests/FSharp.Compiler.UnitTests/BlockTests.fs index e4f4bdd29f..08a718f524 100644 --- a/tests/FSharp.Compiler.UnitTests/BlockTests.fs +++ b/tests/FSharp.Compiler.UnitTests/BlockTests.fs @@ -2,7 +2,7 @@ namespace FSharp.Compiler.UnitTests open Xunit -open FSharp.Test.Utilities +open FSharp.Test open Internal.Utilities.Library module BlockTests = diff --git a/tests/FSharp.Compiler.UnitTests/BuildGraphTests.fs b/tests/FSharp.Compiler.UnitTests/BuildGraphTests.fs index fdcf8dfda9..ae2aeff207 100644 --- a/tests/FSharp.Compiler.UnitTests/BuildGraphTests.fs +++ b/tests/FSharp.Compiler.UnitTests/BuildGraphTests.fs @@ -5,7 +5,8 @@ open System open System.Threading open System.Runtime.CompilerServices open Xunit -open FSharp.Test.Utilities +open FSharp.Test +open FSharp.Test.Compiler open FSharp.Compiler.BuildGraph open Internal.Utilities.Library diff --git a/tests/FSharp.Compiler.UnitTests/ByteMemoryTests.fs b/tests/FSharp.Compiler.UnitTests/ByteMemoryTests.fs index 70653ed68f..6a46f5ce74 100644 --- a/tests/FSharp.Compiler.UnitTests/ByteMemoryTests.fs +++ b/tests/FSharp.Compiler.UnitTests/ByteMemoryTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open System.Globalization open Xunit -open FSharp.Test.Utilities +open FSharp.Test module ByteMemoryTests = open FSharp.Compiler.IO diff --git a/tests/FSharp.Compiler.UnitTests/EditDistance.fs b/tests/FSharp.Compiler.UnitTests/EditDistance.fs index fa56c64d2d..1e00cc0593 100644 --- a/tests/FSharp.Compiler.UnitTests/EditDistance.fs +++ b/tests/FSharp.Compiler.UnitTests/EditDistance.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open System.Globalization open Xunit -open FSharp.Test.Utilities +open FSharp.Test module EditDistance = open Internal.Utilities.EditDistance diff --git a/tests/FSharp.Compiler.UnitTests/FsiTests.fs b/tests/FSharp.Compiler.UnitTests/FsiTests.fs index 2388a56a4b..a19e329843 100644 --- a/tests/FSharp.Compiler.UnitTests/FsiTests.fs +++ b/tests/FSharp.Compiler.UnitTests/FsiTests.fs @@ -3,7 +3,7 @@ open System open System.IO open FSharp.Compiler.Interactive.Shell open Xunit -open FSharp.Test.Utilities +open FSharp.Test [] module FsiTests = diff --git a/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs b/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs index 039b1c5335..8915d0fbf7 100644 --- a/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs +++ b/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs @@ -6,7 +6,7 @@ open System open System.Text open Xunit -open FSharp.Test.Utilities +open FSharp.Test open Internal.Utilities open Internal.Utilities.Text.Lexing diff --git a/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs b/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs index 3060590986..5ccac1bb87 100644 --- a/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs +++ b/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs @@ -4,6 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open System.Text open Xunit +open FSharp.Test open FSharp.Test.Utilities open FSharp.Compiler.Syntax diff --git a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs index bc91de7a3f..417f71a3fe 100644 --- a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs +++ b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs @@ -4,7 +4,7 @@ open System open System.IO open System.Text open Xunit -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.AbstractIL.IL open FSharp.Compiler.CreateILModule.MainModuleBuilder diff --git a/tests/FSharp.Compiler.UnitTests/SuggestionBuffer.fs b/tests/FSharp.Compiler.UnitTests/SuggestionBuffer.fs index f7d798a7d1..7ecadd9320 100644 --- a/tests/FSharp.Compiler.UnitTests/SuggestionBuffer.fs +++ b/tests/FSharp.Compiler.UnitTests/SuggestionBuffer.fs @@ -2,8 +2,7 @@ namespace FSharp.Compiler.UnitTests open Xunit -open FSharp.Test.Utilities - +open FSharp.Test module SuggestionBuffer = open FSharp.Compiler.ErrorResolutionHints diff --git a/tests/FSharp.Test.Utilities/Assert.fs b/tests/FSharp.Test.Utilities/Assert.fs index 64a4b73216..41af78c735 100644 --- a/tests/FSharp.Test.Utilities/Assert.fs +++ b/tests/FSharp.Test.Utilities/Assert.fs @@ -1,4 +1,4 @@ -namespace FSharp.Test.Utilities +namespace FSharp.Test module Assert = open FluentAssertions diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs index f5f9152312..e091a389cd 100644 --- a/tests/FSharp.Test.Utilities/Compiler.fs +++ b/tests/FSharp.Test.Utilities/Compiler.fs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace FSharp.Test.Utilities +namespace FSharp.Test open FSharp.Compiler.Interactive.Shell open FSharp.Compiler.IO open FSharp.Compiler.Diagnostics +open FSharp.Test.Assert open FSharp.Test.Utilities -open FSharp.Test.Utilities.Assert -open FSharp.Test.Utilities.Utilities open FSharp.Test.ScriptHelpers open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.CSharp diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs index 5e3001a514..a3331b19aa 100644 --- a/tests/FSharp.Test.Utilities/CompilerAssert.fs +++ b/tests/FSharp.Test.Utilities/CompilerAssert.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace FSharp.Test.Utilities +namespace FSharp.Test open System open System.IO @@ -15,7 +15,7 @@ open FSharp.Compiler.Text open System.Runtime.Loader #endif open NUnit.Framework -open FSharp.Test.Utilities.Utilities +open FSharp.Test.Utilities open TestFramework [] diff --git a/tests/FSharp.Test.Utilities/ILChecker.fs b/tests/FSharp.Test.Utilities/ILChecker.fs index b6a9319731..c7a65f00ac 100644 --- a/tests/FSharp.Test.Utilities/ILChecker.fs +++ b/tests/FSharp.Test.Utilities/ILChecker.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace FSharp.Test.Utilities +namespace FSharp.Test open System open System.IO diff --git a/tests/FSharp.Test.Utilities/TestFramework.fs b/tests/FSharp.Test.Utilities/TestFramework.fs index efe60a1a41..f7972d0dc5 100644 --- a/tests/FSharp.Test.Utilities/TestFramework.fs +++ b/tests/FSharp.Test.Utilities/TestFramework.fs @@ -183,7 +183,6 @@ module Commands = Directory.CreateDirectory path |> ignore path - type TestConfig = { EnvironmentVariables : Map CSC : string diff --git a/tests/FSharp.Test.Utilities/Utilities.fs b/tests/FSharp.Test.Utilities/Utilities.fs index 2932dcdecc..224a639231 100644 --- a/tests/FSharp.Test.Utilities/Utilities.fs +++ b/tests/FSharp.Test.Utilities/Utilities.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace FSharp.Test.Utilities +namespace FSharp.Test open System open System.IO @@ -10,7 +10,6 @@ open System.Diagnostics open System.Threading.Tasks open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.CSharp -open FSharp.Test.Utilities open TestFramework open NUnit.Framework @@ -53,6 +52,8 @@ module Utilities = stream.CopyTo(memoryStream) bytes + let inline getTestsDirectory dir = __SOURCE_DIRECTORY__ ++ dir + let private getOrCreateResource (resource: byref) (name: string) = match resource with | null -> getResourceBlob name diff --git a/tests/FSharp.Test.Utilities/Xunit/Attributes/DirectoryAttribute.fs b/tests/FSharp.Test.Utilities/Xunit/Attributes/DirectoryAttribute.fs index 824c9f22a1..fd3da92c6e 100644 --- a/tests/FSharp.Test.Utilities/Xunit/Attributes/DirectoryAttribute.fs +++ b/tests/FSharp.Test.Utilities/Xunit/Attributes/DirectoryAttribute.fs @@ -1,4 +1,4 @@ -namespace FSharp.Test.Utilities.Xunit.Attributes +namespace FSharp.Test.Xunit.Attributes open System open System.IO @@ -7,8 +7,8 @@ open Xunit.Sdk open FSharp.Compiler.IO -open FSharp.Test.Utilities -open FSharp.Test.Utilities.Compiler +open FSharp.Test +open FSharp.Test.Compiler /// Attribute to use with Xunit's TheoryAttribute. /// Takes a directory, relative to current test suite's root. diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/BooleanLogic.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/BooleanLogic.fs index 7268da013e..b5ec522512 100644 --- a/tests/fsharp/Compiler/CodeGen/EmittedIL/BooleanLogic.fs +++ b/tests/fsharp/Compiler/CodeGen/EmittedIL/BooleanLogic.fs @@ -2,7 +2,7 @@ namespace FSharp.Compiler.UnitTests.CodeGen.EmittedIL -open FSharp.Test.Utilities +open FSharp.Test open NUnit.Framework [] diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/CeEdiThrow.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/CeEdiThrow.fs index 22d6b93df3..33355e4053 100644 --- a/tests/fsharp/Compiler/CodeGen/EmittedIL/CeEdiThrow.fs +++ b/tests/fsharp/Compiler/CodeGen/EmittedIL/CeEdiThrow.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests.CodeGen.EmittedIL open FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module CeEdiThrow = diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/ComputedListExpressions.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/ComputedListExpressions.fs index 4938f7b2a7..5db43f3a5b 100644 --- a/tests/fsharp/Compiler/CodeGen/EmittedIL/ComputedListExpressions.fs +++ b/tests/fsharp/Compiler/CodeGen/EmittedIL/ComputedListExpressions.fs @@ -2,7 +2,7 @@ namespace FSharp.Compiler.UnitTests.CodeGen.EmittedIL -open FSharp.Test.Utilities +open FSharp.Test open NUnit.Framework [] diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/Mutation.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/Mutation.fs index 0a2bac6b62..4bfc4dd5b0 100644 --- a/tests/fsharp/Compiler/CodeGen/EmittedIL/Mutation.fs +++ b/tests/fsharp/Compiler/CodeGen/EmittedIL/Mutation.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests.CodeGen.EmittedIL open FSharp.Compiler.UnitTests -open FSharp.Test.Utilities +open FSharp.Test open NUnit.Framework [] diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticLinkTests.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticLinkTests.fs index b2a43d8a3f..e07f0103ee 100644 --- a/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticLinkTests.fs +++ b/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticLinkTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests.CodeGen.EmittedIL open System.IO open System.Reflection -open FSharp.Test.Utilities +open FSharp.Test open NUnit.Framework [] diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticMember.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticMember.fs index 02d3d54d95..b1415c0e92 100644 --- a/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticMember.fs +++ b/tests/fsharp/Compiler/CodeGen/EmittedIL/StaticMember.fs @@ -2,7 +2,7 @@ namespace FSharp.Compiler.UnitTests.CodeGen.EmittedIL -open FSharp.Test.Utilities +open FSharp.Test open NUnit.Framework [] diff --git a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/BasicConstants.fs b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/BasicConstants.fs index 5d7a454dcc..30b1e1aa4c 100644 --- a/tests/fsharp/Compiler/Conformance/BasicGrammarElements/BasicConstants.fs +++ b/tests/fsharp/Compiler/Conformance/BasicGrammarElements/BasicConstants.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Conformance/DataExpressions/ComputationExpressions.fs b/tests/fsharp/Compiler/Conformance/DataExpressions/ComputationExpressions.fs index 60b21122a4..5c1c879686 100644 --- a/tests/fsharp/Compiler/Conformance/DataExpressions/ComputationExpressions.fs +++ b/tests/fsharp/Compiler/Conformance/DataExpressions/ComputationExpressions.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Infrastructure/AstCompiler.fs b/tests/fsharp/Compiler/Infrastructure/AstCompiler.fs index 40caa07d3c..8f254fa03d 100644 --- a/tests/fsharp/Compiler/Infrastructure/AstCompiler.fs +++ b/tests/fsharp/Compiler/Infrastructure/AstCompiler.fs @@ -2,7 +2,7 @@ namespace FSharp.Compiler.UnitTests.AstCompiler -open FSharp.Test.Utilities +open FSharp.Test open NUnit.Framework open System.Reflection diff --git a/tests/fsharp/Compiler/Language/AnonRecordTests.fs b/tests/fsharp/Compiler/Language/AnonRecordTests.fs index 7773afcb45..fd7535d007 100644 --- a/tests/fsharp/Compiler/Language/AnonRecordTests.fs +++ b/tests/fsharp/Compiler/Language/AnonRecordTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/ByrefTests.fs b/tests/fsharp/Compiler/Language/ByrefTests.fs index ef9fc80aed..2bb9709a86 100644 --- a/tests/fsharp/Compiler/Language/ByrefTests.fs +++ b/tests/fsharp/Compiler/Language/ByrefTests.fs @@ -3,12 +3,10 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities open FSharp.Compiler.Diagnostics +open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Compiler -open FSharp.Tests +open FSharp.Test.Compiler [] module ByrefTests = diff --git a/tests/fsharp/Compiler/Language/CompilerDirectiveTests.fs b/tests/fsharp/Compiler/Language/CompilerDirectiveTests.fs index 94df44607e..46160b309b 100644 --- a/tests/fsharp/Compiler/Language/CompilerDirectiveTests.fs +++ b/tests/fsharp/Compiler/Language/CompilerDirectiveTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/ComputationExpressionTests.fs b/tests/fsharp/Compiler/Language/ComputationExpressionTests.fs index b8961030ac..583c1c31e9 100644 --- a/tests/fsharp/Compiler/Language/ComputationExpressionTests.fs +++ b/tests/fsharp/Compiler/Language/ComputationExpressionTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/CustomCollectionTests.fs b/tests/fsharp/Compiler/Language/CustomCollectionTests.fs index 0f02e39795..e5106029ef 100644 --- a/tests/fsharp/Compiler/Language/CustomCollectionTests.fs +++ b/tests/fsharp/Compiler/Language/CustomCollectionTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/DefaultInterfaceMemberTests.fs b/tests/fsharp/Compiler/Language/DefaultInterfaceMemberTests.fs index ec87bfe38d..fca1e5fd70 100644 --- a/tests/fsharp/Compiler/Language/DefaultInterfaceMemberTests.fs +++ b/tests/fsharp/Compiler/Language/DefaultInterfaceMemberTests.fs @@ -3,8 +3,8 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework +open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities open FSharp.Compiler.Diagnostics #if NETCOREAPP diff --git a/tests/fsharp/Compiler/Language/FixedIndexSliceTests.fs b/tests/fsharp/Compiler/Language/FixedIndexSliceTests.fs index a9a26f3677..8f1c92f4be 100644 --- a/tests/fsharp/Compiler/Language/FixedIndexSliceTests.fs +++ b/tests/fsharp/Compiler/Language/FixedIndexSliceTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/HatDesugaringTests.fs b/tests/fsharp/Compiler/Language/HatDesugaringTests.fs index 71304dcf5f..d9f47a9b4b 100644 --- a/tests/fsharp/Compiler/Language/HatDesugaringTests.fs +++ b/tests/fsharp/Compiler/Language/HatDesugaringTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/InitOnlyPropertyConsumptionTests.fs b/tests/fsharp/Compiler/Language/InitOnlyPropertyConsumptionTests.fs index eca26290ce..56d828f8a7 100644 --- a/tests/fsharp/Compiler/Language/InitOnlyPropertyConsumptionTests.fs +++ b/tests/fsharp/Compiler/Language/InitOnlyPropertyConsumptionTests.fs @@ -3,10 +3,9 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities.Compiler +open FSharp.Test +open FSharp.Test.Compiler open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities -open FSharp.Tests #if NETCOREAPP diff --git a/tests/fsharp/Compiler/Language/InterfaceTests.fs b/tests/fsharp/Compiler/Language/InterfaceTests.fs index 3a11860f36..231ab11248 100644 --- a/tests/fsharp/Compiler/Language/InterfaceTests.fs +++ b/tests/fsharp/Compiler/Language/InterfaceTests.fs @@ -6,7 +6,6 @@ open FSharp.Compiler.Diagnostics open NUnit.Framework open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities [] module InterfaceTests = diff --git a/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs b/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs index 616f489422..d931003312 100644 --- a/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs +++ b/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs @@ -4,10 +4,9 @@ namespace FSharp.Compiler.UnitTests open FSharp.Compiler.Diagnostics open NUnit.Framework +open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities -open FSharp.Test.Utilities.Compiler -open FSharp.Tests +open FSharp.Test.Compiler [] module OpenTypeDeclarationTests = @@ -2257,7 +2256,7 @@ let main _ = [] let ``Opening type providers with abbreviation result in unqualified access to types and members`` () = - let dir = Core.getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory "typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2299,7 +2298,7 @@ if StaticProperty1 <> "You got a static property" then [] let ``Opening type providers result in unqualified access to types and members`` () = - let dir = Core.getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory "typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2339,7 +2338,7 @@ if StaticProperty1 <> "You got a static property" then [] let ``Opening type providers with nested result in unqualified access to types and members`` () = - let dir = Core.getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory "typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2376,7 +2375,7 @@ if StaticProperty1 <> "You got a static property" then [] let ``Opening generative type providers in unqualified access to types and members`` () = - let dir = Core.getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory "typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2414,7 +2413,7 @@ let _ : TheNestedGeneratedType = Unchecked.defaultof<_> [] let ``Opening generative type providers directly in unqualified access to types and members - Errors`` () = - let dir = Core.getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory "typeProviders/helloWorld" let provider = Fsx (sprintf """ diff --git a/tests/fsharp/Compiler/Language/OptionalInteropTests.fs b/tests/fsharp/Compiler/Language/OptionalInteropTests.fs index 19d3233485..72fa7ee3b2 100644 --- a/tests/fsharp/Compiler/Language/OptionalInteropTests.fs +++ b/tests/fsharp/Compiler/Language/OptionalInteropTests.fs @@ -4,9 +4,9 @@ namespace FSharp.Compiler.UnitTests open System.Collections.Immutable open NUnit.Framework +open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler open FSharp.Compiler.Diagnostics open Microsoft.CodeAnalysis diff --git a/tests/fsharp/Compiler/Language/SlicingQuotationTests.fs b/tests/fsharp/Compiler/Language/SlicingQuotationTests.fs index a7d3a889d2..414d562708 100644 --- a/tests/fsharp/Compiler/Language/SlicingQuotationTests.fs +++ b/tests/fsharp/Compiler/Language/SlicingQuotationTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/SpanOptimizationTests.fs b/tests/fsharp/Compiler/Language/SpanOptimizationTests.fs index 64ceb55ec2..1eec3bd3c6 100644 --- a/tests/fsharp/Compiler/Language/SpanOptimizationTests.fs +++ b/tests/fsharp/Compiler/Language/SpanOptimizationTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test #if NETCOREAPP [] diff --git a/tests/fsharp/Compiler/Language/SpanTests.fs b/tests/fsharp/Compiler/Language/SpanTests.fs index f24036c866..b7aca91e7f 100644 --- a/tests/fsharp/Compiler/Language/SpanTests.fs +++ b/tests/fsharp/Compiler/Language/SpanTests.fs @@ -5,7 +5,7 @@ namespace FSharp.Compiler.UnitTests open System open FSharp.Compiler.Diagnostics open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test #if NETCOREAPP [] diff --git a/tests/fsharp/Compiler/Language/StringConcatOptimizationTests.fs b/tests/fsharp/Compiler/Language/StringConcatOptimizationTests.fs index c392e24774..f27b3bdc23 100644 --- a/tests/fsharp/Compiler/Language/StringConcatOptimizationTests.fs +++ b/tests/fsharp/Compiler/Language/StringConcatOptimizationTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test #if !NETCOREAPP [] diff --git a/tests/fsharp/Compiler/Language/StringInterpolation.fs b/tests/fsharp/Compiler/Language/StringInterpolation.fs index 6d41510b03..be7812ff7c 100644 --- a/tests/fsharp/Compiler/Language/StringInterpolation.fs +++ b/tests/fsharp/Compiler/Language/StringInterpolation.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework open FSharp.Compiler.Diagnostics -open FSharp.Test.Utilities +open FSharp.Test [] module StringInterpolationTests = diff --git a/tests/fsharp/Compiler/Language/StructActivePatternTests.fs b/tests/fsharp/Compiler/Language/StructActivePatternTests.fs index c4c4162fc9..6107d368ef 100644 --- a/tests/fsharp/Compiler/Language/StructActivePatternTests.fs +++ b/tests/fsharp/Compiler/Language/StructActivePatternTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework open FSharp.Compiler.Diagnostics -open FSharp.Test.Utilities +open FSharp.Test [] module StructActivePatternTests = diff --git a/tests/fsharp/Compiler/Language/TypeAttributeTests.fs b/tests/fsharp/Compiler/Language/TypeAttributeTests.fs index 27f8584c59..23d09d9e70 100644 --- a/tests/fsharp/Compiler/Language/TypeAttributeTests.fs +++ b/tests/fsharp/Compiler/Language/TypeAttributeTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Language/UIntTests.fs b/tests/fsharp/Compiler/Language/UIntTests.fs index 8d2b645413..05bf78bbeb 100644 --- a/tests/fsharp/Compiler/Language/UIntTests.fs +++ b/tests/fsharp/Compiler/Language/UIntTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module UIntTests = diff --git a/tests/fsharp/Compiler/Language/WitnessTests.fs b/tests/fsharp/Compiler/Language/WitnessTests.fs index 0d6ce944d6..83da1c707e 100644 --- a/tests/fsharp/Compiler/Language/WitnessTests.fs +++ b/tests/fsharp/Compiler/Language/WitnessTests.fs @@ -3,8 +3,9 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities.Compiler -open FSharp.Tests +open FSharp.Test +open FSharp.Test.Utilities +open FSharp.Test.Compiler #if !NETCOREAPP @@ -13,7 +14,7 @@ module WitnessTests = [] let ``Witness expressions are created as a result of compiling the type provider tests`` () = - let dir = Core.getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory "typeProviders/helloWorld" Fsx (sprintf """ #load @"%s" """ (dir ++ "provider.fsx")) diff --git a/tests/fsharp/Compiler/Libraries/Core/Collections/ListTests.fs b/tests/fsharp/Compiler/Libraries/Core/Collections/ListTests.fs index a57dac45d1..626f9c6e2c 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Collections/ListTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Collections/ListTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Libraries/Core/ExtraTopLevelOperators/DictionaryTests.fs b/tests/fsharp/Compiler/Libraries/Core/ExtraTopLevelOperators/DictionaryTests.fs index c2f0065883..d52624ee01 100644 --- a/tests/fsharp/Compiler/Libraries/Core/ExtraTopLevelOperators/DictionaryTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/ExtraTopLevelOperators/DictionaryTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test module ``Dictionary Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/CastToUnitsTests.fs b/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/CastToUnitsTests.fs index b36481fb33..be85ccd409 100644 --- a/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/CastToUnitsTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/CastToUnitsTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module ``Cast to Units Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/ComparisonTests.fs b/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/ComparisonTests.fs index 4e5c5d2657..e3b5abf34f 100644 --- a/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/ComparisonTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/ComparisonTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module ``Comparison Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/StringFormatTests.fs b/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/StringFormatTests.fs index 7e5f01967a..46380acecd 100644 --- a/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/StringFormatTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/LanguagePrimitives/StringFormatTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module ``String Format Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/NativeInterop/StackallocTests.fs b/tests/fsharp/Compiler/Libraries/Core/NativeInterop/StackallocTests.fs index 9111f90d87..1e244b53aa 100644 --- a/tests/fsharp/Compiler/Libraries/Core/NativeInterop/StackallocTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/NativeInterop/StackallocTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics #nowarn "9" diff --git a/tests/fsharp/Compiler/Libraries/Core/Operators/AbsTests.fs b/tests/fsharp/Compiler/Libraries/Core/Operators/AbsTests.fs index 826bafd33a..ca2f753de4 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Operators/AbsTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Operators/AbsTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework open FSharp.Compiler.Diagnostics -open FSharp.Test.Utilities +open FSharp.Test [] module ``Abs Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Operators/CastTests.fs b/tests/fsharp/Compiler/Libraries/Core/Operators/CastTests.fs index 5f4d34df15..df5bc32602 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Operators/CastTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Operators/CastTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open System [] diff --git a/tests/fsharp/Compiler/Libraries/Core/Operators/HashTests.fs b/tests/fsharp/Compiler/Libraries/Core/Operators/HashTests.fs index b5b7f8af3d..e809fafa93 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Operators/HashTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Operators/HashTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework open FSharp.Compiler.Diagnostics -open FSharp.Test.Utilities +open FSharp.Test [] module ``Hash Tests`` = diff --git a/tests/fsharp/Compiler/Libraries/Core/Operators/SignTests.fs b/tests/fsharp/Compiler/Libraries/Core/Operators/SignTests.fs index 158131e2ca..2c67b1d1b8 100644 --- a/tests/fsharp/Compiler/Libraries/Core/Operators/SignTests.fs +++ b/tests/fsharp/Compiler/Libraries/Core/Operators/SignTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework open FSharp.Compiler.Diagnostics -open FSharp.Test.Utilities +open FSharp.Test [] module ``Sign Tests`` = diff --git a/tests/fsharp/Compiler/Regressions/ForInDoMutableRegressionTest.fs b/tests/fsharp/Compiler/Regressions/ForInDoMutableRegressionTest.fs index 28cc634042..6ea9fe2dc4 100644 --- a/tests/fsharp/Compiler/Regressions/ForInDoMutableRegressionTest.fs +++ b/tests/fsharp/Compiler/Regressions/ForInDoMutableRegressionTest.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module ForInDoMutableRegressionTest = diff --git a/tests/fsharp/Compiler/Regressions/IndexerRegressionTests.fs b/tests/fsharp/Compiler/Regressions/IndexerRegressionTests.fs index a6e7cf6e4e..c9c1a77baf 100644 --- a/tests/fsharp/Compiler/Regressions/IndexerRegressionTests.fs +++ b/tests/fsharp/Compiler/Regressions/IndexerRegressionTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module IndexerRegressionTests = diff --git a/tests/fsharp/Compiler/Regressions/NullableOptionalRegressionTests.fs b/tests/fsharp/Compiler/Regressions/NullableOptionalRegressionTests.fs index 26391ffa1c..c4009ee523 100644 --- a/tests/fsharp/Compiler/Regressions/NullableOptionalRegressionTests.fs +++ b/tests/fsharp/Compiler/Regressions/NullableOptionalRegressionTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities.Compiler +open FSharp.Test.Compiler [] module NullableOptionalRegressionTests = diff --git a/tests/fsharp/Compiler/Service/MultiProjectTests.fs b/tests/fsharp/Compiler/Service/MultiProjectTests.fs index 88a131fad0..7835f409f8 100644 --- a/tests/fsharp/Compiler/Service/MultiProjectTests.fs +++ b/tests/fsharp/Compiler/Service/MultiProjectTests.fs @@ -6,10 +6,9 @@ open System open System.IO open FSharp.Compiler.Diagnostics open NUnit.Framework +open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities -open FSharp.Test.Utilities.Compiler -open FSharp.Tests +open FSharp.Test.Compiler open FSharp.Compiler.CodeAnalysis open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.CSharp diff --git a/tests/fsharp/Compiler/Service/SignatureGenerationTests.fs b/tests/fsharp/Compiler/Service/SignatureGenerationTests.fs index 3fb1a5487c..b6898e524b 100644 --- a/tests/fsharp/Compiler/Service/SignatureGenerationTests.fs +++ b/tests/fsharp/Compiler/Service/SignatureGenerationTests.fs @@ -4,10 +4,9 @@ namespace FSharp.Compiler.UnitTests open FSharp.Compiler.Diagnostics open NUnit.Framework +open FSharp.Test open FSharp.Test.Utilities -open FSharp.Test.Utilities.Utilities -open FSharp.Test.Utilities.Compiler -open FSharp.Tests +open FSharp.Test.Compiler [] module SignatureGenerationTests = diff --git a/tests/fsharp/Compiler/Stress/LargeExprTests.fs b/tests/fsharp/Compiler/Stress/LargeExprTests.fs index c0c8e69cda..b9d6e7bece 100644 --- a/tests/fsharp/Compiler/Stress/LargeExprTests.fs +++ b/tests/fsharp/Compiler/Stress/LargeExprTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test [] module LargeExprTests = diff --git a/tests/fsharp/Compiler/Warnings/AssignmentWarningTests.fs b/tests/fsharp/Compiler/Warnings/AssignmentWarningTests.fs index c87ccdefd0..d6ef26bcdf 100644 --- a/tests/fsharp/Compiler/Warnings/AssignmentWarningTests.fs +++ b/tests/fsharp/Compiler/Warnings/AssignmentWarningTests.fs @@ -3,7 +3,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Warnings/ExperimentalAttributeTests.fs b/tests/fsharp/Compiler/Warnings/ExperimentalAttributeTests.fs index d83ac8632e..ed51078bf7 100644 --- a/tests/fsharp/Compiler/Warnings/ExperimentalAttributeTests.fs +++ b/tests/fsharp/Compiler/Warnings/ExperimentalAttributeTests.fs @@ -2,7 +2,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/Compiler/Warnings/PatternMatchingWarningTests.fs b/tests/fsharp/Compiler/Warnings/PatternMatchingWarningTests.fs index 4aa8feb8a7..864f760cc0 100644 --- a/tests/fsharp/Compiler/Warnings/PatternMatchingWarningTests.fs +++ b/tests/fsharp/Compiler/Warnings/PatternMatchingWarningTests.fs @@ -1,7 +1,7 @@ namespace FSharp.Compiler.UnitTests open NUnit.Framework -open FSharp.Test.Utilities +open FSharp.Test open FSharp.Compiler.Diagnostics [] diff --git a/tests/fsharp/TypeProviderTests.fs b/tests/fsharp/TypeProviderTests.fs index 971960ddcd..6350d6b682 100644 --- a/tests/fsharp/TypeProviderTests.fs +++ b/tests/fsharp/TypeProviderTests.fs @@ -20,6 +20,7 @@ open Scripting open SingleTest open FSharp.Compiler.IO +open FSharp.Test.Utilities #if !NETCOREAPP // All tests which do a manual invoke of the F# compiler are disabled @@ -33,7 +34,6 @@ let FSC_BASIC = FSC_OPT_PLUS_DEBUG let FSI_BASIC = FSI_FILE #endif -let inline getTestsDirectory dir = __SOURCE_DIRECTORY__ ++ dir let testConfig = getTestsDirectory >> testConfig [] diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index de6642c396..04fcc12776 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -17,6 +17,8 @@ open TestFramework open Scripting open SingleTest open HandleExpects +open FSharp.Test +open FSharp.Test.Utilities #if NETCOREAPP // Use these lines if you want to test CoreCLR @@ -31,7 +33,6 @@ let FSI_BASIC = FSI_FILE #endif // ^^^^^^^^^^^^ To run these tests in F# Interactive , 'build net40', then send this chunk, then evaluate body of a test ^^^^^^^^^^^^ -let inline getTestsDirectory dir = __SOURCE_DIRECTORY__ ++ dir let singleTestBuildAndRun = getTestsDirectory >> singleTestBuildAndRun let singleTestBuildAndRunVersion = getTestsDirectory >> singleTestBuildAndRunVersion let testConfig = getTestsDirectory >> testConfig From 9ccc1e6dfabf8ccb1490d151f51e93640b72703a Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 15 Jul 2021 14:50:12 -0700 Subject: [PATCH 2/2] relative paths --- src/scripts/scriptlib.fsx | 1 - tests/FSharp.Test.Utilities/Utilities.fs | 2 +- .../Compiler/Language/OpenTypeDeclarationTests.fs | 10 +++++----- tests/fsharp/Compiler/Language/WitnessTests.fs | 2 +- tests/fsharp/TypeProviderTests.fs | 2 +- tests/fsharp/tests.fs | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx index 0cf23b4b29..ea49f9a44d 100644 --- a/src/scripts/scriptlib.fsx +++ b/src/scripts/scriptlib.fsx @@ -77,7 +77,6 @@ module Scripting = if Directory.Exists output then Directory.Delete(output, true) - let log format = printfn format type FilePath = string diff --git a/tests/FSharp.Test.Utilities/Utilities.fs b/tests/FSharp.Test.Utilities/Utilities.fs index 224a639231..5139e8a0e7 100644 --- a/tests/FSharp.Test.Utilities/Utilities.fs +++ b/tests/FSharp.Test.Utilities/Utilities.fs @@ -52,7 +52,7 @@ module Utilities = stream.CopyTo(memoryStream) bytes - let inline getTestsDirectory dir = __SOURCE_DIRECTORY__ ++ dir + let inline getTestsDirectory src dir = src ++ dir let private getOrCreateResource (resource: byref) (name: string) = match resource with diff --git a/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs b/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs index d931003312..7d04809e43 100644 --- a/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs +++ b/tests/fsharp/Compiler/Language/OpenTypeDeclarationTests.fs @@ -2256,7 +2256,7 @@ let main _ = [] let ``Opening type providers with abbreviation result in unqualified access to types and members`` () = - let dir = getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory __SOURCE_DIRECTORY__ "../../typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2298,7 +2298,7 @@ if StaticProperty1 <> "You got a static property" then [] let ``Opening type providers result in unqualified access to types and members`` () = - let dir = getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory __SOURCE_DIRECTORY__ "../../typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2338,7 +2338,7 @@ if StaticProperty1 <> "You got a static property" then [] let ``Opening type providers with nested result in unqualified access to types and members`` () = - let dir = getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory __SOURCE_DIRECTORY__ "../../typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2375,7 +2375,7 @@ if StaticProperty1 <> "You got a static property" then [] let ``Opening generative type providers in unqualified access to types and members`` () = - let dir = getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory __SOURCE_DIRECTORY__ "../../typeProviders/helloWorld" let provider = Fsx (sprintf """ @@ -2413,7 +2413,7 @@ let _ : TheNestedGeneratedType = Unchecked.defaultof<_> [] let ``Opening generative type providers directly in unqualified access to types and members - Errors`` () = - let dir = getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory __SOURCE_DIRECTORY__ "../../typeProviders/helloWorld" let provider = Fsx (sprintf """ diff --git a/tests/fsharp/Compiler/Language/WitnessTests.fs b/tests/fsharp/Compiler/Language/WitnessTests.fs index 83da1c707e..7ed562bd9a 100644 --- a/tests/fsharp/Compiler/Language/WitnessTests.fs +++ b/tests/fsharp/Compiler/Language/WitnessTests.fs @@ -14,7 +14,7 @@ module WitnessTests = [] let ``Witness expressions are created as a result of compiling the type provider tests`` () = - let dir = getTestsDirectory "typeProviders/helloWorld" + let dir = getTestsDirectory __SOURCE_DIRECTORY__ "../../typeProviders/helloWorld" Fsx (sprintf """ #load @"%s" """ (dir ++ "provider.fsx")) diff --git a/tests/fsharp/TypeProviderTests.fs b/tests/fsharp/TypeProviderTests.fs index 6350d6b682..70fc9c7f32 100644 --- a/tests/fsharp/TypeProviderTests.fs +++ b/tests/fsharp/TypeProviderTests.fs @@ -20,7 +20,6 @@ open Scripting open SingleTest open FSharp.Compiler.IO -open FSharp.Test.Utilities #if !NETCOREAPP // All tests which do a manual invoke of the F# compiler are disabled @@ -34,6 +33,7 @@ let FSC_BASIC = FSC_OPT_PLUS_DEBUG let FSI_BASIC = FSI_FILE #endif +let inline getTestsDirectory dir = FSharp.Test.Utilities.getTestsDirectory __SOURCE_DIRECTORY__ dir let testConfig = getTestsDirectory >> testConfig [] diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index 04fcc12776..a86071426d 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -18,7 +18,6 @@ open Scripting open SingleTest open HandleExpects open FSharp.Test -open FSharp.Test.Utilities #if NETCOREAPP // Use these lines if you want to test CoreCLR @@ -33,6 +32,7 @@ let FSI_BASIC = FSI_FILE #endif // ^^^^^^^^^^^^ To run these tests in F# Interactive , 'build net40', then send this chunk, then evaluate body of a test ^^^^^^^^^^^^ +let inline getTestsDirectory dir = FSharp.Test.Utilities.getTestsDirectory __SOURCE_DIRECTORY__ dir let singleTestBuildAndRun = getTestsDirectory >> singleTestBuildAndRun let singleTestBuildAndRunVersion = getTestsDirectory >> singleTestBuildAndRunVersion let testConfig = getTestsDirectory >> testConfig