Reorder tests assertions as result == expected

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/commoncode/cliutils.py

@@ -243,13 +243,13 @@ def fixed_width_file_name(path, max_length=25):
 
     For example:
     >>> fwfn = fixed_width_file_name('0123456789012345678901234.c')
-    >>> assert '0123456789...5678901234.c' == fwfn
+    >>> assert fwfn == '0123456789...5678901234.c'
     >>> fwfn = fixed_width_file_name('some/path/0123456789012345678901234.c')
-    >>> assert '0123456789...5678901234.c' == fwfn
+    >>> assert fwfn == '0123456789...5678901234.c'
     >>> fwfn = fixed_width_file_name('some/sort.c')
-    >>> assert 'sort.c' == fwfn
+    >>> assert fwfn == 'sort.c'
     >>> fwfn = fixed_width_file_name('some/123456', max_length=5)
-    >>> assert '' == fwfn
+    >>> assert fwfn == ''
     """
     if not path:
         return ''

src/commoncode/testcase.py

@@ -269,7 +269,7 @@ def file_cmp(file1, file2, ignore_line_endings=False):
         f2c = f2.read()
         if ignore_line_endings:
             f2c = b'\n'.join(f2c.splitlines(False))
-    assert f1c == f2c
+    assert f2c == f1c
 
 
 def make_non_readable(location):

tests/test_cliutils.py

@@ -42,66 +42,66 @@ def mycli():
 xyz
 End
 '''
-        assert expected == result.output
+        assert result.output == expected
 
 
 class TestFixedWidthFilename(FileDrivenTesting):
 
     def test_fixed_width_file_name_with_file_name_larger_than_max_length_is_shortened(self):
         test = fixed_width_file_name('0123456789012345678901234.c', 25)
         expected = '0123456789...5678901234.c'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_file_name_smaller_than_max_length_is_not_shortened(self):
         file_name = '0123456789012345678901234.c'
         test = fixed_width_file_name(file_name, max_length=50)
-        assert file_name == test
+        assert test == file_name
 
     def test_fixed_width_file_name_with_file_name_at_max_length_is_not_shortened(self):
         test = fixed_width_file_name('01234567890123456789012.c', 25)
         expected = '01234567890123456789012.c'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_file_name_smaller_than_max_length_not_shortened(self):
         test = fixed_width_file_name('0123456789012345678901.c', 25)
         expected = '0123456789012345678901.c'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_none_filename_return_empty_string(self):
         test = fixed_width_file_name(None, 25)
         expected = ''
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_without_extension(self):
         test = fixed_width_file_name('012345678901234567890123456', 25)
         expected = '01234567890...67890123456'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_posix_path_without_shortening(self):
         test = fixed_width_file_name('C/Documents_and_Settings/Boki/Desktop/head/patches/drupal6/drupal.js', 25)
         expected = 'drupal.js'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_posix_path_with_shortening(self):
         test = fixed_width_file_name('C/Documents_and_Settings/Boki/Desktop/head/patches/drupal6/012345678901234567890123.c', 25)
         expected = '0123456789...4567890123.c'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_win_path_without_shortening(self):
         test = fixed_width_file_name('C\\:Documents_and_Settings\\Boki\\Desktop\\head\\patches\\drupal6\\drupal.js', 25)
         expected = 'drupal.js'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_win_path_with_shortening(self):
         test = fixed_width_file_name('C\\:Documents_and_Settings\\Boki\\Desktop\\head\\patches\\drupal6\\012345678901234567890123.c', 25)
         expected = '0123456789...4567890123.c'
-        assert expected == test
+        assert test == expected
 
     def test_fixed_width_file_name_with_very_small_file_name_and_long_extension(self):
         test = fixed_width_file_name('abc.abcdef', 5)
         # FIXME: what is expected is TBD
         expected = ''
-        assert expected == test
+        assert test == expected
 
 
 class TestGroupedHelpCommand(FileDrivenTesting):

tests/test_codec.py

@@ -18,62 +18,62 @@ class TestCodec(TestCase):
     def test_bin_to_num_basic(self):
         expected = 123
         result = bin_to_num(b'{')
-        assert expected == result
+        assert result == expected
 
     def test_bin_to_num_zero(self):
         expected = 0
         result = bin_to_num(b'\x00')
-        assert expected == result
+        assert result == expected
 
     def test_bin_to_num_large_number(self):
         expected = 432346237462348763
         result = bin_to_num(b'\x06\x00\x00\x9c\xbf\xeb\x83\xdb')
-        assert expected == result
+        assert result == expected
 
     def test_bin_to_num_and_num_to_bin_is_idempotent(self):
         expected = 432346237462348763
         result = bin_to_num(num_to_bin(432346237462348763))
-        assert expected == result
+        assert result == expected
 
     def test_num_to_bin_basic(self):
         expected = b'{'
         result = num_to_bin(123)
-        assert expected == result
+        assert result == expected
 
     def test_num_to_bin_zero(self):
         expected = b'\x00'
         result = num_to_bin(0)
-        assert expected == result
+        assert result == expected
 
     def test_num_to_bin_large_number(self):
         expected = b'\x06\x00\x00\x9c\xbf\xeb\x83\xdb'
         result = num_to_bin(432346237462348763)
-        assert expected == result
+        assert result == expected
 
     def test_num_to_bin_bin_to_num_is_idempotent(self):
         expected = b'\x06\x00\x00\x9c\xbf\xeb\x83\xdb'
         result = num_to_bin(bin_to_num(b'\x06\x00\x00\x9c\xbf\xeb\x83\xdb'))
-        assert expected == result
+        assert result == expected
 
     def test_urlsafe_b64encode_int_zero(self):
-        assert  b'AA==' == urlsafe_b64encode_int(0)
+        assert urlsafe_b64encode_int(0) ==  b'AA=='
 
     def test_urlsafe_b64encode_int_basic(self):
-        assert b'HKq1w7M=' == urlsafe_b64encode_int(123123123123)
+        assert urlsafe_b64encode_int(123123123123) == b'HKq1w7M='
 
     def test_urlsafe_b64encode_int_limit_8bits_255(self):
-        assert b'_w==' == urlsafe_b64encode_int(255)
+        assert urlsafe_b64encode_int(255) == b'_w=='
 
     def test_urlsafe_b64encode_int_limit_8bits_256(self):
-        assert b'AQA=' == urlsafe_b64encode_int(256)
+        assert urlsafe_b64encode_int(256) == b'AQA='
 
     def test_urlsafe_b64encode_int_adds_no_padding_for_number_that_are_multiple_of_6_bits(self):
-        assert b'____________' == urlsafe_b64encode_int(0xFFFFFFFFFFFFFFFFFF)
-        assert 8 == len(urlsafe_b64encode_int(0xFFFFFFFFFFFF))
+        assert urlsafe_b64encode_int(0xFFFFFFFFFFFFFFFFFF) == b'____________'
+        assert len(urlsafe_b64encode_int(0xFFFFFFFFFFFF)) == 8
 
     def test_urlsafe_b64encode_int_very_large_number(self):
         b64 = (b'QAAAAAAgAAAAAQAACAAAAAAAAAAAAAAkAAIAAAAAAAAAAAAAAACAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAiAAAAAAAIAAAAAAAAAAAAAAEAACAAAAAAAA=')
         expected = b64
         num = 2678771517966886466622496485850735537232223496190189203248435106535830319026141316924949516664780383591425235756710588949364368366679435700855700642969357960349427980681242720502045830438444033569999428606714388704082526548154984676817460705606960919023941301616034362869262429593297635158449513824256
         result = urlsafe_b64encode_int(num)
-        assert expected == result
+        assert result == expected

tests/test_command.py

@@ -30,9 +30,9 @@ def test_execute_can_handle_non_ascii_output(self):
         rc, stdout, stderr = command.execute(
             python, ['-c', 'print("non ascii: été just passed it !")']
         )
-        assert '' == stderr
-        assert 'non ascii: ete just passed it !' == stdout
-        assert 0 == rc
+        assert stderr == ''
+        assert stdout == 'non ascii: ete just passed it !'
+        assert rc == 0
         # do not throw exception
         stdout.encode('ascii')
 
@@ -41,9 +41,9 @@ def test_execute_(self):
         rc, stdout, stderr = command.execute(
             python, ['-c', 'print("foobar")']
         )
-        assert '' == stderr
-        assert 'foobar' == stdout
-        assert 0 == rc
+        assert stderr == ''
+        assert stdout == 'foobar'
+        assert rc == 0
         # do not throw exception
         stdout.encode('ascii')
 
@@ -52,9 +52,9 @@ def test_execute2(self):
         rc, stdout, stderr = command.execute2(
             python, ['-c', 'print("foobar")']
         )
-        assert '' == stderr
-        assert 'foobar' == stdout
-        assert 0 == rc
+        assert stderr == ''
+        assert stdout == 'foobar'
+        assert rc == 0
         # do not throw exception
         stdout.encode('ascii')
 
@@ -64,51 +64,51 @@ def test_update_path_var_on_linux(self):
 
         new_path = b'foo\xb1bar'
         updated_path = command.update_path_var(existing_path_var, new_path)
-        assert 'foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == 'foo\udcb1bar:/usr/bin:/usr/local'
 
         new_path = u'/bin/foo\udcb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local'
 
         new_path = b'/bin/foo\xb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local'
 
         new_path = u'foo\udcb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local'
 
         new_path = b'foo\xb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local'
 
     @skipIf(not on_mac, 'Mac only')
     def test_update_path_var_on_mac(self):
         existing_path_var = '/usr/bin:/usr/local'
 
         new_path = u'foo\udcb1bar'
         updated_path = command.update_path_var(existing_path_var, new_path)
-        assert 'foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == 'foo\udcb1bar:/usr/bin:/usr/local'
 
         new_path = b'/bin/foo\xb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local'
 
         new_path = u'foo\udcb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local' == updated_path
+        assert updated_path == '/bin/foo\udcb1bar:foo\udcb1bar:/usr/bin:/usr/local'
 
     @skipIf(not on_windows, 'Windows only')
     def test_update_path_var_on_windows(self):
         existing_path_var = u'c:\\windows;C:Program Files'
 
         new_path = u'foo\udcb1bar'
         updated_path = command.update_path_var(existing_path_var, new_path)
-        assert u'foo\udcb1bar;c:\\windows;C:Program Files' == updated_path
+        assert updated_path == u'foo\udcb1bar;c:\\windows;C:Program Files'
 
         new_path = u'foo\udcb1bar'
         updated_path = command.update_path_var(updated_path, new_path)
-        assert u'foo\udcb1bar;c:\\windows;C:Program Files' == updated_path
+        assert updated_path == u'foo\udcb1bar;c:\\windows;C:Program Files'
 
     def test_searchable_paths(self):
         d1 = self.get_temp_dir('foo')
@@ -123,25 +123,25 @@ def test_searchable_paths(self):
             # macOS somehow adds a /private to the paths in the CI as a side-
             # effect of calling "realpath" and likely resolving links
             expected = f'/private{d1}', f'/private{d2}', f'/private{d2}', f'/private{d1}'
-        assert command.searchable_paths(env_vars=env_vars) == expected
+        assert expected == command.searchable_paths(env_vars=env_vars)
 
     def test_find_in_path(self):
         d1 = self.get_temp_dir('foo')
         d2 = self.get_temp_dir('bar')
         filename = 'baz'
 
-        assert command.find_in_path(filename, searchable_paths=(d1, d2,)) == None
+        assert None == command.find_in_path(filename, searchable_paths=(d1, d2,))
 
         f2 = os.path.join(d2, filename)
         with open(f2, 'w') as o:
             o.write('some')
 
-        assert command.find_in_path(filename, searchable_paths=(d1, d2,)) == f2
-        assert command.find_in_path(filename, searchable_paths=(d2, d1,)) == f2
+        assert f2 == command.find_in_path(filename, searchable_paths=(d1, d2,))
+        assert f2 == command.find_in_path(filename, searchable_paths=(d2, d1,))
 
         f1 = os.path.join(d1, filename)
         with open(f1, 'w') as o:
             o.write('some')
 
-        assert command.find_in_path(filename, searchable_paths=(d1, d2,)) == f1
-        assert command.find_in_path(filename, searchable_paths=(d2, d1,)) == f2
+        assert f1 == command.find_in_path(filename, searchable_paths=(d1, d2,))
+        assert f2 == command.find_in_path(filename, searchable_paths=(d2, d1,))

tests/test_date.py

@@ -36,7 +36,7 @@ def as_yyyymmdd(s):
 
         now = datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ')
         result = commoncode.date.get_file_mtime(test_file)
-        assert as_yyyymmdd(now) == as_yyyymmdd(result)
+        assert as_yyyymmdd(result) == as_yyyymmdd(now)
 
     def test_get_file_mtime_for_a_modified_file(self):
         test_file = self.get_temp_file()
@@ -45,12 +45,12 @@ def test_get_file_mtime_for_a_modified_file(self):
         m_ts = (24 * 3600) * 134 + (24 * 3600 * 365) * 22
         # setting modified time to expected values
         os.utime(test_file, (m_ts, m_ts))
-        assert expected == commoncode.date.get_file_mtime(test_file)
+        assert commoncode.date.get_file_mtime(test_file) == expected
 
     def test_get_file_mtime_for_a_modified_file_2(self):
         test_file = self.get_temp_file()
         open(test_file, 'w').close()
         # setting modified time to expected values
         expected = u'2011-01-06 14:35:00'
         os.utime(test_file, (1294324500, 1294324500))
-        assert expected == commoncode.date.get_file_mtime(test_file)
+        assert commoncode.date.get_file_mtime(test_file) == expected

tests/test_fileset.py

@@ -18,7 +18,7 @@ class FilesetTest(commoncode.testcase.FileBasedTesting):
     def test_load(self):
         irf = self.get_test_loc('fileset/scancodeignore.lst')
         result = fileset.load(irf)
-        assert ['/foo/*', '!/foobar/*', 'bar/*', '#comment'] == result
+        assert result == ['/foo/*', '!/foobar/*', 'bar/*', '#comment']
 
     def test_is_included_basic(self):
         assert fileset.is_included('/common/src/', {}, {})