From 5868129877f580117241c71959ac33a478523f9f Mon Sep 17 00:00:00 2001 From: Scott Ming Date: Mon, 18 Sep 2023 09:10:17 +0800 Subject: [PATCH] Apply some code review suggestions about test --- .../code_intelligence/rename_test.exs | 103 ++++++++++-------- 1 file changed, 57 insertions(+), 46 deletions(-) diff --git a/apps/remote_control/test/lexical/remote_control/code_intelligence/rename_test.exs b/apps/remote_control/test/lexical/remote_control/code_intelligence/rename_test.exs index adc4b83ae..a5e0ad814 100644 --- a/apps/remote_control/test/lexical/remote_control/code_intelligence/rename_test.exs +++ b/apps/remote_control/test/lexical/remote_control/code_intelligence/rename_test.exs @@ -49,9 +49,9 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do ~q[ defmodule |Foo do end - ] |> rename("Bar") + ] |> rename("Renamed") - assert result =~ ~S[defmodule Bar do] + assert result =~ ~S[defmodule Renamed do] end test "succeeds when the cursor on the alias" do @@ -60,9 +60,9 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule Baz do alias |Foo end - ] |> rename("Bar") + ] |> rename("Renamed") - assert result =~ ~S[alias Bar] + assert result =~ ~S[alias Renamed] end test "succeeds when the definition in a nested module" do @@ -76,10 +76,18 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule TopLevelTest do alias TopLevel.|Foo end - ] |> rename("Bar") + ] |> rename("Renamed") - assert result =~ ~S[ defmodule Bar do] - assert result =~ ~S[ alias TopLevel.Bar] + assert result == ~q[ + defmodule TopLevel do + defmodule Renamed do + end + end + + defmodule TopLevelTest do + alias TopLevel.Renamed + end + ] end test "succeeds when the cursor in the multiple aliases off of single alias" do @@ -92,9 +100,9 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do } |Second end - ] |> rename("Bar") + ] |> rename("Renamed") - assert result =~ ~S[ First, Bar,] + assert result =~ ~S[ First, Renamed,] end test "only rename the aliased when the cursor at the aliased" do @@ -105,10 +113,10 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do |FooBar end ] - |> rename("FooBarBar") + |> rename("Renamed") - assert result =~ ~S[alias Foo.Bar, as: FooBarBar] - assert result =~ ~S[ FooBarBar] + assert result =~ ~S[alias Foo.Bar, as: Renamed] + assert result =~ ~S[ Renamed] end test "succeeds when the cursor at the alias_ased child" do @@ -122,10 +130,30 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do Parent.|Bar end ] - |> rename("Baz") + |> rename("Renamed") + + assert result =~ ~S[defmodule TopLevel.Foo.Renamed] + + assert result =~ ~S[ Parent.Renamed] + end + + test "only rename aliased when the cursor at the alias_ased" do + {:ok, result} = + ~q[ + defmodule TopLevel.Foo.Bar do + end + + defmodule TopLevel.Another do + alias TopLevel.Foo, as: Parent + |Parent.Bar + end + ] + |> rename("Renamed") - assert result =~ ~S[defmodule TopLevel.Foo.Baz] - assert result =~ ~S[Parent.Baz] + assert result =~ ~S[defmodule TopLevel.Foo.Bar do] + + assert result =~ ~S[alias TopLevel.Foo, as: Renamed] + assert result =~ ~S[ Renamed.Bar] end test "shouldn't rename the relative module" do @@ -136,7 +164,7 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule FooTest do end - ] |> rename("ShouldNotRenameTest") + ] |> rename("Renamed") assert result =~ ~S[defmodule FooTest do] end @@ -149,12 +177,12 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule TopLevel.Module.Another do # x alias TopLevel.|Module end - ] |> rename("Baz") + ] |> rename("Renamed") - refute result =~ ~S[defmodule TopLevel.Baz.Another] + refute result =~ ~S[defmodule TopLevel.Renamed.Another] - assert result =~ ~S[defmodule TopLevel.Baz do] - assert result =~ ~S[alias TopLevel.Baz] + assert result =~ ~S[defmodule TopLevel.Renamed do] + assert result =~ ~S[alias TopLevel.Renamed] end end @@ -165,10 +193,10 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule TopLevel.|Middle.Module do alias TopLevel.Middle.Module end - ] |> rename("Foo") + ] |> rename("Renamed") - assert result =~ ~S[defmodule TopLevel.Foo.Module] - assert result =~ ~S[alias TopLevel.Foo.Module] + assert result =~ ~S[defmodule TopLevel.Renamed.Module] + assert result =~ ~S[alias TopLevel.Renamed.Module] end test "in the middle of reference" do @@ -177,27 +205,10 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule TopLevel.Middle.Module do alias TopLevel.|Middle.Module end - ] |> rename("Foo") - - assert result =~ ~S[defmodule TopLevel.Foo.Module] - assert result =~ ~S[alias TopLevel.Foo.Module] - end - - test "succeeds when the cursor at the alias_ased reference" do - {:ok, result} = - ~q[ - defmodule TopLevel.Foo.Bar do - end + ] |> rename("Renamed") - defmodule TopLevel.Another do - alias TopLevel.Foo, as: Parent - |Parent.Bar - end - ] - |> rename("AsedParent") - - assert result =~ ~S[alias TopLevel.Foo, as: AsedParent] - assert result =~ ~S[AsedParent.Bar] + assert result =~ ~S[defmodule TopLevel.Renamed.Module] + assert result =~ ~S[alias TopLevel.Renamed.Module] end test "succeeds when there are same module name in the cursor neighborhood" do @@ -212,11 +223,11 @@ defmodule Lexical.RemoteControl.CodeIntelligence.RenameTest do defmodule TopLevel.Another do alias TopLevel.Foo.|Foo end - ] |> rename("Bar") + ] |> rename("Renamed") assert result =~ ~S[defmodule TopLevel.Foo do] - assert result =~ ~S[defmodule TopLevel.Foo.Bar do] - assert result =~ ~S[alias TopLevel.Foo.Bar] + assert result =~ ~S[defmodule TopLevel.Foo.Renamed do] + assert result =~ ~S[alias TopLevel.Foo.Renamed] end end