From 9b2b19d2cbe4584d66b2974b03777310e9dfbc50 Mon Sep 17 00:00:00 2001 From: Jeroen Engels Date: Sun, 8 Sep 2024 18:40:23 +0200 Subject: [PATCH] Fix invalid syntax in test code --- tests/NoUnused/ExportsTest.elm | 1 + tests/NoUnused/VariablesTest.elm | 34 ++++++++++++++++-------- tests/Review/Test/FailureMessageTest.elm | 2 +- tests/Tests/NoInconsistentAliases.elm | 34 ++++++++++++++++++------ 4 files changed, 51 insertions(+), 20 deletions(-) diff --git a/tests/NoUnused/ExportsTest.elm b/tests/NoUnused/ExportsTest.elm index ad1d6479b..1af363676 100644 --- a/tests/NoUnused/ExportsTest.elm +++ b/tests/NoUnused/ExportsTest.elm @@ -1361,6 +1361,7 @@ tests : Test tests = Test.describe "thing" B.helper """, """ module B exposing (helper) +{-| Module docs -} {-| @ignore-helper -} helper = 1 """ ] diff --git a/tests/NoUnused/VariablesTest.elm b/tests/NoUnused/VariablesTest.elm index 7408c01b4..5c6f517c4 100644 --- a/tests/NoUnused/VariablesTest.elm +++ b/tests/NoUnused/VariablesTest.elm @@ -156,6 +156,7 @@ b = 2""" , test "should report unused top-level variables with documentation attached" <| \() -> """module SomeModule exposing (b) +{-| Module docs -} {-| Documentation -} unusedVar = 1 @@ -168,11 +169,13 @@ b = 2""" , under = "unusedVar" } |> Review.Test.whenFixed """module SomeModule exposing (b) +{-| Module docs -} b = 2""" ] , test "should report unused top-level variables with documentation attached even if they are annotated" <| \() -> """module SomeModule exposing (b) +{-| Module docs -} {-| Documentation -} unusedVar : Int @@ -185,8 +188,9 @@ b = 2""" , details = details , under = "unusedVar" } - |> Review.Test.atExactly { start = { row = 5, column = 1 }, end = { row = 5, column = 10 } } + |> Review.Test.atExactly { start = { row = 6, column = 1 }, end = { row = 6, column = 10 } } |> Review.Test.whenFixed """module SomeModule exposing (b) +{-| Module docs -} b = 2""" ] , test "should not report unused top-level variables if everything is exposed (functions)" <| @@ -642,7 +646,7 @@ topLevelVariablesUsedInLetInTests = """module SomeModule exposing (a) b = 1 a = let c = 1 -in b + c""" + in b + c""" |> Review.Test.run rule |> Review.Test.expectNoErrors , test "should not report top-level variables used inside let declarations" <| @@ -650,21 +654,25 @@ in b + c""" """module SomeModule exposing (a) b = 1 a = let c = b -in c""" + in c +""" |> Review.Test.run rule |> Review.Test.expectNoErrors , test "should not report top-level variables used in nested lets" <| \() -> """module SomeModule exposing (a) b = 1 -a = let - c = b - d = let - e = 1 - in - b + c + e -in - d""" +a = + let + c = b + d = + let + e = 1 + in + b + c + e + in + d +""" |> Review.Test.run rule |> Review.Test.expectNoErrors ] @@ -2016,6 +2024,7 @@ a = 1""" , test "should report unused custom type declarations with documentation" <| \() -> """module SomeModule exposing (a) +{-| Module docs -} {-| Documentation -} type UnusedType = B | C a = 1""" @@ -2027,6 +2036,7 @@ a = 1""" , under = "UnusedType" } |> Review.Test.whenFixed """module SomeModule exposing (a) +{-| Module docs -} a = 1""" ] , test "should report unused custom type declaration even when it references itself" <| @@ -2089,6 +2099,7 @@ a = 1""" , test "should report unused type aliases declarations with documentation" <| \() -> """module SomeModule exposing (a) +{-| Module docs -} {-| Documentation -} type alias UnusedType = { a : B } a = 1""" @@ -2100,6 +2111,7 @@ a = 1""" , under = "UnusedType" } |> Review.Test.whenFixed """module SomeModule exposing (a) +{-| Module docs -} a = 1""" ] , test "should not report type alias used in a signature" <| diff --git a/tests/Review/Test/FailureMessageTest.elm b/tests/Review/Test/FailureMessageTest.elm index bb8512e9a..28ebee71b 100644 --- a/tests/Review/Test/FailureMessageTest.elm +++ b/tests/Review/Test/FailureMessageTest.elm @@ -143,7 +143,7 @@ Hint: Maybe you forgot to add the module definition at the top, like: , test "when there are multiple files" <| \() -> [ "module MyModule exposing (.." - , "module MyOtherModule exposing (..)" + , "module MyOtherModule exposing (..)\na = 1" ] |> Review.Test.runOnModules testRuleReportsLiterals |> Review.Test.expectNoErrors diff --git a/tests/Tests/NoInconsistentAliases.elm b/tests/Tests/NoInconsistentAliases.elm index 58a9366a3..c35fd53d0 100644 --- a/tests/Tests/NoInconsistentAliases.elm +++ b/tests/Tests/NoInconsistentAliases.elm @@ -274,10 +274,19 @@ shiftRange : ( ESN.Node String, Int ) -> { node : ESN.Node String } -> { a | nod shiftRange input _ _ = let asList : ( ESN.Node, Int ) -> List ESN.Node - asList ( node, _ ) = [ node ] - ( ESN.Node range1 value1, length1 ) = input - [ ESN.Node range2 value2 ] = asList input - ESN.Node range3 value3 :: [] = asList input + asList ( node, _ ) = + [ node ] + + ( ESN.Node range value, length1 ) = + case asList input of + [ ESN.Node range2 value2 ] -> + input + + ESN.Node range3 value3 :: _ -> + input + + _ -> + input in range """ @@ -298,10 +307,19 @@ shiftRange : ( Node.Node String, Int ) -> { node : Node.Node String } -> { a | n shiftRange input _ _ = let asList : ( Node.Node, Int ) -> List Node.Node - asList ( node, _ ) = [ node ] - ( Node.Node range1 value1, length1 ) = input - [ Node.Node range2 value2 ] = asList input - Node.Node range3 value3 :: [] = asList input + asList ( node, _ ) = + [ node ] + + ( Node.Node range value, length1 ) = + case asList input of + [ Node.Node range2 value2 ] -> + input + + Node.Node range3 value3 :: _ -> + input + + _ -> + input in range """