generatestubtests take2

ionide · Nov 23, 2024 · ebb9c5d · ebb9c5d
1 parent 81b7ea9
commit ebb9c5d
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 5 deletions.
diff --git a/test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests.fs b/test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests.fs
@@ -9,6 +9,14 @@ open System.IO
 
 let sourceDir = __SOURCE_DIRECTORY__
 let expectedTestDir = Path.Join(sourceDir, "GenerateAbstractClassStubTests")
+
+let tfm =
+#if NET8_0
+  "net80"
+#else
+  "net90"
+#endif
+
 let expectFile file = File.ReadAllText(Path.Join(expectedTestDir, file))
 let tests state =
   let config = { defaultConfigDto with AbstractClassStubGeneration = Some true }
@@ -51,7 +59,7 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        (expectFile "can_generate_abstract_class_stub.expected")
+        (expectFile $"can_generate_abstract_class_stub.{tfm}.expected")
 
     testCaseAsync "can generate abstract class stub with another member with attribute" <|
       CodeFix.check server
@@ -75,7 +83,7 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-         (expectFile "can_generate_abstract_class_stub_with_another_member_with_attribute.expected")
+         (expectFile $"can_generate_abstract_class_stub_with_another_member_with_attribute.{tfm}.expected")
 
     testCaseAsync "can generate abstract class stub without trailing nl" <|
       CodeFix.check server
@@ -96,7 +104,7 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        (expectFile "can_generate_abstract_class_stub_without_trailing_nl.expected")
+        (expectFile $"can_generate_abstract_class_stub_without_trailing_nl.{tfm}.expected")
 
     testCaseAsync "inserts override in correct place" <|
       CodeFix.check server
@@ -117,7 +125,7 @@ let tests state =
         let a = 0"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        (expectFile "inserts_override_in_correct_place.expected")
+        (expectFile $"inserts_override_in_correct_place.{tfm}.expected")
 
     testCaseAsync "can generate abstract class stub with existing override" <|
       CodeFix.check server
@@ -140,5 +148,5 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        (expectFile "can_generate_abstract_class_stub_with_existing_override.expected")
+        (expectFile $"can_generate_abstract_class_stub_with_existing_override.{tfm}.expected")
   ])
diff --git a/...deFixTests/GenerateAbstractClassStubTests/can_generate_abstract_class_stub.net80.expected b/...deFixTests/GenerateAbstractClassStubTests/can_generate_abstract_class_stub.net80.expected
@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+      ()
diff --git a/...can_generate_abstract_class_stub.expected → ...nerate_abstract_class_stub.net90.expected b/...can_generate_abstract_class_stub.expected → ...nerate_abstract_class_stub.net90.expected
diff --git a/...bTests/can_generate_abstract_class_stub_with_another_member_with_attribute.net80.expected b/...bTests/can_generate_abstract_class_stub_with_another_member_with_attribute.net80.expected
@@ -0,0 +1,22 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+
+        [<CompiledName("yo")>]
+        member x.Foo() = 1
+      ()
diff --git a/...th_another_member_with_attribute.expected → ...ther_member_with_attribute.net90.expected b/...th_another_member_with_attribute.expected → ...ther_member_with_attribute.net90.expected
diff --git a/...ractClassStubTests/can_generate_abstract_class_stub_with_existing_override.net80.expected b/...ractClassStubTests/can_generate_abstract_class_stub_with_existing_override.net80.expected
@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+
+        override this.Name = "Circle"
+      ()
diff --git a/...lass_stub_with_existing_override.expected → ...tub_with_existing_override.net90.expected b/...lass_stub_with_existing_override.expected → ...tub_with_existing_override.net90.expected
diff --git a/...bstractClassStubTests/can_generate_abstract_class_stub_without_trailing_nl.net80.expected b/...bstractClassStubTests/can_generate_abstract_class_stub_without_trailing_nl.net80.expected
@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+      ()
diff --git a/...t_class_stub_without_trailing_nl.expected → ...s_stub_without_trailing_nl.net90.expected b/...t_class_stub_without_trailing_nl.expected → ...s_stub_without_trailing_nl.net90.expected
diff --git a/...eFixTests/GenerateAbstractClassStubTests/inserts_override_in_correct_place.net80.expected b/...eFixTests/GenerateAbstractClassStubTests/inserts_override_in_correct_place.net80.expected
@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+      let a = 0
diff --git a/...nserts_override_in_correct_place.expected → ..._override_in_correct_place.net90.expected b/...nserts_override_in_correct_place.expected → ..._override_in_correct_place.net90.expected