update ansicolor/ansicolor.py, ansicolor/demos.py, tests/test_colors.py

ansicolor/ansicolor.py: move function get_code_v2 colorize_v2 follow the original function
tests/test_colors.py: move test test_color_v2 behind test_color
ansicolor/demos.py: new demo demo_color_v2

1 files changed, 49 insertions, 51 deletions

diff --git a/tests/test_colors.py b/tests/test_colors.py
index 7bcaf2f..ea1fb38 100644
--- a/tests/test_colors.py
+++ b/tests/test_colors.py
@@ -35,6 +35,40 @@ def test_codes():
     # bold + reverse color
     assert '\033[1;7;31m' == get_code(Colors.Red, bold=True, reverse=True)
 
+def test_codes_v2():
+    # reset code
+    assert '\033[0m' == get_code_v2(None)
+
+    # plain color codes
+    assert '\033[0;30m' == get_code_v2(Colors.Black)
+    assert '\033[0;31m' == get_code_v2(Colors.Red)
+    assert '\033[0;32m' == get_code_v2(Colors.Green)
+    assert '\033[0;33m' == get_code_v2(Colors.Yellow)
+    assert '\033[0;34m' == get_code_v2(Colors.Blue)
+    assert '\033[0;35m' == get_code_v2(Colors.Magenta)
+    assert '\033[0;36m' == get_code_v2(Colors.Cyan)
+    assert '\033[0;37m' == get_code_v2(Colors.White)
+
+    # bold, underline, blink, reverse color
+    assert '\033[1;31m' == get_code_v2(Colors.Red, bold=True)
+    assert '\033[4;31m' == get_code_v2(Colors.Red, underline=True)
+    assert '\033[5;31m' == get_code_v2(Colors.Red, blink=True)
+    assert '\033[7;31m' == get_code_v2(Colors.Red, reverse=True)
+
+    # mixed color
+    assert '\033[1;4;31m' == get_code_v2(Colors.Red, bold=True, underline=True)
+    assert '\033[1;5;31m' == get_code_v2(Colors.Red, bold=True, blink=True)
+    assert '\033[1;7;31m' == get_code_v2(Colors.Red, bold=True, reverse=True)
+    
+    assert '\033[4;5;31m' == get_code_v2(Colors.Red, underline=True, blink=True)
+    assert '\033[4;7;31m' == get_code_v2(Colors.Red, underline=True, reverse=True)
+    
+    assert '\033[5;7;31m' == get_code_v2(Colors.Red, blink=True, reverse=True)
+    
+    assert '\033[1;4;5;31m' == get_code_v2(Colors.Red, bold=True, underline=True, blink=True)
+    assert '\033[1;4;7;31m' == get_code_v2(Colors.Red, bold=True, underline=True, reverse=True)
+    assert '\033[1;5;7;31m' == get_code_v2(Colors.Red, bold=True, blink=True, reverse=True)
+    assert '\033[1;4;5;7;31m' == get_code_v2(Colors.Red, bold=True, underline=True, blink=True, reverse=True)
 
 def test_coloring():
     assert '\033[0;0;31m' + 'hi' + '\033[0;0m' == red('hi')
@@ -62,6 +96,21 @@ def test_colorize2():
         + "e"
     ) == colorize("Hi there", Colors.Red, start=1, end=7)
 
+def test_colorize_v2():
+    assert (
+        get_code(Colors.Red)
+        + "Hi there"
+        + get_code(None)
+    ) == colorize("Hi there", Colors.Red)
+
+    assert (
+        "H"
+        + get_code(Colors.Red)
+        + "i ther"
+        + get_code(None)
+        + "e"
+    ) == colorize("Hi there", Colors.Red, start=1, end=7)
+
 
 def test_wrap_string():
     assert (
@@ -102,54 +151,3 @@ def test_justify_formatted():
     assert justify_formatted(
         red("hi"), rjust, 10
     ) == "        " + red("hi")
-
-
-def test_codes_v2():
-    # reset code
-    assert '\033[0m' == get_code_v2(None)
-
-    # plain color codes
-    assert '\033[0;30m' == get_code_v2(Colors.Black)
-    assert '\033[0;31m' == get_code_v2(Colors.Red)
-    assert '\033[0;32m' == get_code_v2(Colors.Green)
-    assert '\033[0;33m' == get_code_v2(Colors.Yellow)
-    assert '\033[0;34m' == get_code_v2(Colors.Blue)
-    assert '\033[0;35m' == get_code_v2(Colors.Magenta)
-    assert '\033[0;36m' == get_code_v2(Colors.Cyan)
-    assert '\033[0;37m' == get_code_v2(Colors.White)
-
-    # bold, underline, blink, reverse color
-    assert '\033[1;31m' == get_code_v2(Colors.Red, bold=True)
-    assert '\033[4;31m' == get_code_v2(Colors.Red, underline=True)
-    assert '\033[5;31m' == get_code_v2(Colors.Red, blink=True)
-    assert '\033[7;31m' == get_code_v2(Colors.Red, reverse=True)
-
-    # mixed color
-    assert '\033[1;4;31m' == get_code_v2(Colors.Red, bold=True, underline=True)
-    assert '\033[1;5;31m' == get_code_v2(Colors.Red, bold=True, blink=True)
-    assert '\033[1;7;31m' == get_code_v2(Colors.Red, bold=True, reverse=True)
-    
-    assert '\033[4;5;31m' == get_code_v2(Colors.Red, underline=True, blink=True)
-    assert '\033[4;7;31m' == get_code_v2(Colors.Red, underline=True, reverse=True)
-    
-    assert '\033[5;7;31m' == get_code_v2(Colors.Red, blink=True, reverse=True)
-    
-    assert '\033[1;4;5;31m' == get_code_v2(Colors.Red, bold=True, underline=True, blink=True)
-    assert '\033[1;4;7;31m' == get_code_v2(Colors.Red, bold=True, underline=True, reverse=True)
-    assert '\033[1;5;7;31m' == get_code_v2(Colors.Red, bold=True, blink=True, reverse=True)
-    assert '\033[1;4;5;7;31m' == get_code_v2(Colors.Red, bold=True, underline=True, blink=True, reverse=True)
-
-def test_colorize_v2():
-    assert (
-        get_code(Colors.Red)
-        + "Hi there"
-        + get_code(None)
-    ) == colorize("Hi there", Colors.Red)
-
-    assert (
-        "H"
-        + get_code(Colors.Red)
-        + "i ther"
-        + get_code(None)
-        + "e"
-    ) == colorize("Hi there", Colors.Red, start=1, end=7)