From 58ba47841c87defd809539743360ce7b26ada96d Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 28 Feb 2020 01:53:27 +0100 Subject: [PATCH] Use inline_mod instead of some_mod for inline refactor tests --- test/refactor/import_tree/inline_mod.py | 1 + test/refactor/import_tree/some_mod.py | 2 -- test/refactor/inline.py | 24 +++++++++++------------- test/refactor/rename.py | 4 +--- 4 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 test/refactor/import_tree/inline_mod.py diff --git a/test/refactor/import_tree/inline_mod.py b/test/refactor/import_tree/inline_mod.py new file mode 100644 index 00000000..0a1303e3 --- /dev/null +++ b/test/refactor/import_tree/inline_mod.py @@ -0,0 +1 @@ +inline_var = 5 + 3 diff --git a/test/refactor/import_tree/some_mod.py b/test/refactor/import_tree/some_mod.py index 79aed14e..ccb0f5e6 100644 --- a/test/refactor/import_tree/some_mod.py +++ b/test/refactor/import_tree/some_mod.py @@ -1,3 +1 @@ foobar = 3 - -inline_var = 5 + 3 diff --git a/test/refactor/inline.py b/test/refactor/inline.py index eb8d8813..5d8b5f5b 100644 --- a/test/refactor/inline.py +++ b/test/refactor/inline.py @@ -59,28 +59,26 @@ math.cos # ++++++++++++++++++++++++++++++++++++++++++++++++++ Cannot inline builtins/extensions # -------------------------------------------------- module-error -from import_tree import some_mod +from import_tree import inline_mod #? 11 error -test(some_mod) +test(inline_mod) # ++++++++++++++++++++++++++++++++++++++++++++++++++ Cannot inline imports or modules # -------------------------------------------------- module-works -from import_tree import some_mod -#? 20 -test(x, some_mod. inline_var.conjugate) +from import_tree import inline_mod +#? 22 +test(x, inline_mod. inline_var.conjugate) # ++++++++++++++++++++++++++++++++++++++++++++++++++ --- inline.py +++ inline.py @@ -1,4 +1,4 @@ - from import_tree import some_mod - #? 20 --test(x, some_mod. inline_var.conjugate) + from import_tree import inline_mod + #? 22 +-test(x, inline_mod. inline_var.conjugate) +test(x, (5 + 3).conjugate) ---- import_tree/some_mod.py -+++ import_tree/some_mod.py -@@ -1,4 +1,3 @@ - foobar = 3 - +--- import_tree/inline_mod.py ++++ import_tree/inline_mod.py +@@ -1,2 +1 @@ -inline_var = 5 + 3 # -------------------------------------------------- class class A: pass diff --git a/test/refactor/rename.py b/test/refactor/rename.py index c1286453..864032b8 100644 --- a/test/refactor/rename.py +++ b/test/refactor/rename.py @@ -108,11 +108,9 @@ foobar # ++++++++++++++++++++++++++++++++++++++++++++++++++ --- import_tree/some_mod.py +++ import_tree/some_mod.py -@@ -1,4 +1,4 @@ +@@ -1,2 +1,2 @@ -foobar = 3 +renamed = 3 - - inline_var = 5 + 3 --- rename.py +++ rename.py @@ -1,4 +1,4 @@