Improve tests

Author: edgarfgp

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBang01.fs

@@ -0,0 +1,55 @@
+open System
+
+type Disposable() =
+    [<DefaultValue>] static val mutable private disposedTimes: int
+    [<DefaultValue>] static val mutable private constructedTimes: int
+
+    do Disposable.constructedTimes <- Disposable.constructedTimes + 1
+
+    static member DisposeCallCount() = Disposable.disposedTimes
+    static member ConstructorCallCount() = Disposable.constructedTimes
+
+    interface IDisposable with
+        member _.Dispose() =
+            Disposable.disposedTimes <- Disposable.disposedTimes + 1
+
+type DisposableBuilder() =
+    member _.Using(resource: #IDisposable, f) =
+        async {
+            use res = resource
+            return! f res
+        }
+        
+    member _.Bind(disposable: Disposable, f) =
+        async {
+            let c = disposable
+            return! f c
+        }
+    
+    member _.Return(x) = async.Return x
+    
+    member _.ReturnFrom(x) = x
+    
+    member _.Bind(task, f) = async.Bind(task, f)
+
+let counterDisposable = DisposableBuilder()
+
+let example() =
+    counterDisposable {
+        use! res = new Disposable()
+        use! __ = new Disposable()
+        use! (res1) = new Disposable()
+        use! (___) = new Disposable()
+        use! _ = new Disposable()
+        return ()
+    }
+
+example()
+|> Async.RunSynchronously
+
+let disposeCalls = Disposable.DisposeCallCount()
+if disposeCalls <> 5 then
+    failwithf $"unexpected dispose call count: %i{disposeCalls}"
+let ctorCalls = Disposable.ConstructorCallCount()
+if ctorCalls <> 5 then
+    failwithf $"unexpected constructor call count: %i{ctorCalls}"

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBangBindings.fs

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace Language
+
+open FSharp.Test
+open Xunit
+open FSharp.Test.Compiler
+
+module UseBangBindingsVersion9 =
+    [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"UseBang01.fs"|])>]
+    let ``UseBangBindings - UseBang01_fs - Current LangVersion`` compilation =
+        compilation
+        |> asFsx
+        |> withLangVersion90
+        |> typecheck
+        |> shouldFail
+        |> withDiagnostics [
+            (Error 1228, Line 43, Col 14, Line 43, Col 15, "'use!' bindings must be of the form 'use! <var> = <expr>'")
+        ]
+
+module UseBangBindingsPreview =
+    [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"UseBang01.fs"|])>]
+    let ``UseBangBindings - UseBang01_fs - Preview LangVersion`` compilation =
+        compilation
+        |> asExe
+        |> withLangVersionPreview
+        |> compileAndRun
+        |> shouldSucceed

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindingDiscard02.fs

@@ -0,0 +1,26 @@
+open System
+
+type private Disposable() =
+    [<DefaultValue>] static val mutable private disposedTimes: int
+    [<DefaultValue>] static val mutable private constructedTimes: int
+
+    do Disposable.constructedTimes <- Disposable.constructedTimes + 1
+
+    static member DisposeCallCount() = Disposable.disposedTimes
+    static member ConstructorCallCount() = Disposable.constructedTimes
+
+    interface System.IDisposable with
+        member _.Dispose() =
+            Disposable.disposedTimes <- Disposable.disposedTimes + 1
+
+let _scope =
+    use _ = new Disposable()
+    ()
+
+let disposeCalls = Disposable.DisposeCallCount()
+if disposeCalls <> 1 then
+    failwith "was not disposed or disposed too many times"
+
+let ctorCalls = Disposable.ConstructorCallCount()
+if ctorCalls <> 1 then
+    failwithf "unexpected constructor call count: %i" ctorCalls

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/UseBindings/UseBindings.fs

@@ -27,35 +27,9 @@ module UseBindings =
         |> withErrorCode 3350
         |> withDiagnosticMessageMatches "Feature 'discard pattern in use binding' is not available.*"
 
-    [<Fact>]
-    let ``Dispose called for discarded value of use binding`` () =
-        Fsx """
-type private Disposable() =
-    [<DefaultValue>] static val mutable private disposedTimes: int
-    [<DefaultValue>] static val mutable private constructedTimes: int
-
-    do Disposable.constructedTimes <- Disposable.constructedTimes + 1
-
-    static member DisposeCallCount() = Disposable.disposedTimes
-    static member ConstructorCallCount() = Disposable.constructedTimes
-
-    interface System.IDisposable with
-        member _.Dispose() =
-            Disposable.disposedTimes <- Disposable.disposedTimes + 1
-
-let _scope =
-    use _ = new Disposable()
-    ()
-
-let disposeCalls = Disposable.DisposeCallCount()
-if disposeCalls <> 1 then
-    failwith "was not disposed or disposed too many times"
-
-let ctorCalls = Disposable.ConstructorCallCount()
-if ctorCalls <> 1 then
-    failwithf "unexpected constructor call count: %i" ctorCalls
-
-        """
+    [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"UseBindingDiscard02.fs"|])>]
+    let ``Dispose called for discarded value of use binding`` compilation =
+        compilation
         |> asExe
         |> withLangVersion60
         |> compileAndRun

tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj

@@ -76,6 +76,7 @@
     <Compile Include="Conformance\BasicGrammarElements\TypeAbbreviations\WarnForAttributeAlias.fs" />
     <Compile Include="Conformance\BasicGrammarElements\ValueRestriction\ValueRestriction.fs" />
     <Compile Include="Conformance\BasicGrammarElements\UseBindings\UseBindings.fs" />
+    <Compile Include="Conformance\BasicGrammarElements\UseBindings\UseBangBindings.fs" />
     <Compile Include="Conformance\Constraints\Unmanaged.fs" />
     <Compile Include="Conformance\GeneratedEqualityHashingComparison\Attributes\Diags\Attributes_Diags.fs" />
     <Compile Include="Conformance\GeneratedEqualityHashingComparison\Attributes\Legacy\Attributes_Legacy.fs" />
@@ -232,7 +233,6 @@
     <Compile Include="Language\InterpolatedStringsTests.fs" />
     <Compile Include="Language\ComputationExpressionTests.fs" />
     <Compile Include="Language\StateMachineTests.fs" />
-    <Compile Include="Language\UseBangBindingsTests.fs" />
     <Compile Include="Language\DynamicAssignmentOperatorTests.fs" />
     <Compile Include="Language\CastingTests.fs" />
     <Compile Include="Language\NameofTests.fs" />