Simplify tests

Author: dflook

test/test_windows_encoding.py test/test_unicode_cli.pytest/test_windows_encoding.py renamed to test/test_unicode_cli.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
-import pytest
 import tempfile
 import os
 import subprocess
 import sys
-import locale
 import codecs
 
 # Compatibility for subprocess.run (added in Python 3.5)
@@ -36,108 +34,91 @@ def safe_decode(data, encoding='utf-8', errors='replace'):
 
 
 def test_cli_output_flag_with_unicode():
-    """Regression test for GitHub issues #2, #57, #59, #68, #113, #123, #129.
-
+    """
     Tests that the CLI tool can write Unicode characters to files using --output flag.
-    This should fail on Windows without proper encoding handling.
     """
     # Minimal source with all problematic Unicode characters from reported issues
     source_code = u'print(u"❌ ✓ 🐍 Привет © ∀")'
 
-    # Create temporary source file
-    # Python 2.7 doesn't support encoding parameter, so use binary mode
-    with tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False) as source_file:
-        source_file.write(source_code.encode('utf-8'))
-        source_path = source_file.name
+    source_file = tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False)
+    source_file.write(source_code.encode('utf-8'))
+    source_file.close()
 
-    # Create temporary output file path
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.min.py', delete=False) as output_file:
-        output_path = output_file.name
+    output_path = source_file.name + '.min.py'
 
     try:
-        # Remove output file so pyminify can create it
-        os.unlink(output_path)
-
-        # Run pyminify CLI with --output flag (this should reproduce Windows encoding errors)
+        # Run pyminify CLI with --output flag
         result = run_subprocess([
             sys.executable, '-m', 'python_minifier',
-            source_path, '--output', output_path
+            source_file.name, '--output', output_path
         ], timeout=30)
 
-        # Test should fail if CLI command fails (indicates Windows encoding bug)
         assert result.returncode == 0, "CLI failed with encoding error: {}".format(safe_decode(result.stderr))
 
         # Verify the output file was created and contains Unicode characters
-        # Python 2.7 doesn't support encoding parameter in open()
         with codecs.open(output_path, 'r', encoding='utf-8') as f:
             minified_content = f.read()
 
         # Verify problematic Unicode characters are preserved
         if hasattr(sys, 'pypy_version_info') and sys.version_info[0] >= 3:
-            # PyPy3: Unicode characters are escaped as \\u escapes
-            assert "\\u274c" in minified_content  # ❌ Issue #113
-            assert "✓" in minified_content   # Issue #129
-            assert "\\U0001f40d" in minified_content  # 🐍 General emoji
-            assert "Привет" in minified_content  # Issue #123
-            assert "©" in minified_content   # Issue #59
-            assert "∀" in minified_content   # Mathematical symbols
+            # PyPy3: Unicode characters may be escaped as \\u escapes
+            assert "\\u274c" in minified_content
+            assert "✓" in minified_content
+            assert "\\U0001f40d" in minified_content
+            assert "Привет" in minified_content
+            assert "©" in minified_content
+            assert "∀" in minified_content
         elif hasattr(sys, 'pypy_version_info') and sys.version_info[0] < 3:
             # PyPy2: Unicode characters appear as UTF-8 byte sequences
-            assert "\\xe2\\x9d\\x8c" in minified_content  # ❌ Issue #113
-            assert "\\xe2\\x9c\\x93" in minified_content  # ✓ Issue #129
-            assert "\\xf0\\x9f\\x90\\x8d" in minified_content  # 🐍 General emoji
+            assert "\\xe2\\x9d\\x8c" in minified_content  # ❌
+            assert "\\xe2\\x9c\\x93" in minified_content  # ✓
+            assert "\\xf0\\x9f\\x90\\x8d" in minified_content  # 🐍
         elif sys.version_info[0] >= 3:
-            # CPython 3: Unicode characters should appear literally  
-            assert "❌" in minified_content  # Issue #113
-            assert "✓" in minified_content   # Issue #129
-            assert "🐍" in minified_content  # General emoji
-            assert "Привет" in minified_content  # Issue #123
-            assert "©" in minified_content   # Issue #59
-            assert "∀" in minified_content   # Mathematical symbols
+            # CPython 3: Unicode characters should appear literally
+            assert "❌" in minified_content
+            assert "✓" in minified_content
+            assert "🐍" in minified_content
+            assert "Привет" in minified_content
+            assert "©" in minified_content
+            assert "∀" in minified_content
         else:
             # Python 2.7: Check for escaped sequences or use Unicode literals
-            assert u"\\xe2\\x9d\\x8c" in minified_content or u"❌" in minified_content  # ❌
-            assert u"\\xe2\\x9c\\x93" in minified_content or u"✓" in minified_content  # ✓ 
-            assert u"\\xf0\\x9f\\x90\\x8d" in minified_content or u"🐍" in minified_content  # 🐍
+            assert u"\\xe2\\x9d\\x8c" in minified_content
+            assert u"\\xe2\\x9c\\x93" in minified_content
+            assert u"\\xf0\\x9f\\x90\\x8d" in minified_content
 
     finally:
         # Cleanup
-        if os.path.exists(source_path):
-            os.unlink(source_path)
+        if os.path.exists(source_file.name):
+            os.unlink(source_file.name)
         if os.path.exists(output_path):
             os.unlink(output_path)
 
 
 def test_cli_in_place_with_unicode():
-    """Regression test for --in-place flag with Unicode characters.
-
-    Tests GitHub issues #57, #68 where --in-place fails on Windows.
+    """
+    Tests that the CLI tool can write Unicode characters to files using --in-place flag.
     """
     source_code = u'print(u"❌ ✓ 🐍 Привет © ∀")'
 
-    # Create temporary file
-    # Python 2.7 doesn't support encoding parameter, so use binary mode
-    with tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False) as temp_file:
-        temp_file.write(source_code.encode('utf-8'))
-        temp_path = temp_file.name
+    temp_file = tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False)
+    temp_file.write(source_code.encode('utf-8'))
+    temp_file.close()
 
     try:
         # Run pyminify with --in-place flag
         result = run_subprocess([
             sys.executable, '-m', 'python_minifier',
-            temp_path, '--in-place'
+            temp_file.name, '--in-place'
         ], timeout=30)
 
-        # Test should fail if CLI command fails (indicates Windows encoding bug)
         assert result.returncode == 0, "CLI failed with encoding error: {}".format(safe_decode(result.stderr))
 
-        # Verify Unicode characters are preserved in the modified file
-        # Python 2.7 doesn't support encoding parameter in open()
-        with codecs.open(temp_path, 'r', encoding='utf-8') as f:
+        with codecs.open(temp_file.name, 'r', encoding='utf-8') as f:
             content = f.read()
 
         if hasattr(sys, 'pypy_version_info') and sys.version_info[0] >= 3:
-            # PyPy3: Unicode characters are escaped as \\u escapes  
+            # PyPy3: Unicode characters may be escaped as \\u escapes
             assert "✓" in content
             assert "\\u274c" in content  # ❌
             assert "\\U0001f40d" in content  # 🐍
@@ -158,43 +139,38 @@ def test_cli_in_place_with_unicode():
             assert "©" in content
             assert "∀" in content
         else:
-            # Python 2.7: Check for escaped sequences or Unicode literals
-            assert u"\\xe2\\x9c\\x93" in content or u"✓" in content  # ✓
-            assert u"\\xe2\\x9d\\x8c" in content or u"❌" in content  # ❌
-            assert u"\\xf0\\x9f\\x90\\x8d" in content or u"🐍" in content  # 🐍
+            # Python 2.7: Unicode characters appear as escaped sequences
+            assert "\\xe2\\x9d\\x8c" in content  # ❌
+            assert "\\xe2\\x9c\\x93" in content  # ✓
+            assert "\\xf0\\x9f\\x90\\x8d" in content  # 🐍
 
     finally:
-        if os.path.exists(temp_path):
-            os.unlink(temp_path)
+        if os.path.exists(temp_file.name):
+            os.unlink(temp_file.name)
 
 
 def test_cli_stdout_with_unicode():
-    """Verify that stdout output works fine (as reported in issues).
-
-    All GitHub issues mention that stdout output works, only file output fails.
+    """
+    Tests that the CLI tool can write Unicode characters to stdout.
     """
     source_code = u'print(u"❌ ✓ 🐍 Привет © ∀")'
 
-    # Python 2.7 doesn't support encoding parameter, so use binary mode
-    with tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False) as temp_file:
-        temp_file.write(source_code.encode('utf-8'))
-        temp_path = temp_file.name
+    temp_file = tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False)
+    temp_file.write(source_code.encode('utf-8'))
+    temp_file.close()
 
     try:
         # Run without --output or --in-place (should output to stdout)
-        # Use our compatibility function to avoid subprocess decoding issues with Windows
-        # We'll manually decode as UTF-8 to properly handle Unicode characters
         result = run_subprocess([
-            sys.executable, '-m', 'python_minifier', temp_path
+            sys.executable, '-m', 'python_minifier', temp_file.name
         ], timeout=30)
 
         assert result.returncode == 0, "Stdout output failed: {}".format(safe_decode(result.stderr))
 
-        # Decode stdout and verify Unicode characters are present
         stdout_text = safe_decode(result.stdout)
-        
+
         if hasattr(sys, 'pypy_version_info') and sys.version_info[0] >= 3:
-            # PyPy3: Unicode characters are escaped as \\u escapes
+            # PyPy3: Unicode characters may be escaped as \\u escapes
             assert "\\u274c" in stdout_text  # ❌
             assert "✓" in stdout_text   # ✓
             assert "\\U0001f40d" in stdout_text  # 🐍
@@ -216,31 +192,5 @@ def test_cli_stdout_with_unicode():
             assert "\\xf0\\x9f\\x90\\x8d" in stdout_text  # 🐍
 
     finally:
-        os.unlink(temp_path)
-
-
-@pytest.mark.skipif(os.name != 'nt', reason="Windows-specific encoding test")
-def test_windows_default_encoding_detection():
-    """Test to detect Windows default encoding that causes issues."""
-
-    # Check what encoding Python would use on Windows for file operations
-    default_encoding = locale.getpreferredencoding()
-
-    # On problematic Windows systems, this is often cp1252, gbk, or similar
-    print("Windows default encoding: {}".format(default_encoding))
-
-    # This test documents the encoding environment for debugging
-    assert default_encoding is not None
-
-
-def test_system_encoding_info():
-    """Diagnostic test to understand system encoding setup."""
-
-    print("System default encoding: {}".format(sys.getdefaultencoding()))
-    print("Filesystem encoding: {}".format(sys.getfilesystemencoding()))
-    print("Preferred encoding: {}".format(locale.getpreferredencoding()))
-    print("Platform: {}".format(sys.platform))
-
-    # This test always passes but provides diagnostic information
-    assert True
-
+        if os.path.exists(temp_file.name):
+            os.unlink(temp_file.name)