@@ -787,11 +787,13 @@ def test_bytes(self):
787787 def test_from_cmy (self ):
788788 cmy = pygame .Color .from_cmy (0.5 , 0.5 , 0.5 )
789789 cmy_tuple = pygame .Color .from_cmy ((0.5 , 0.5 , 0.5 ))
790+ cmy_instance = pygame .Color (0 , 0 , 0 , 0 ).from_cmy (0.5 , 0.5 , 0.5 )
790791
791792 expected_cmy = (127 , 127 , 127 )
792793
793794 self .assertEqual (expected_cmy , cmy )
794795 self .assertEqual (expected_cmy , cmy_tuple )
796+ self .assertEqual (expected_cmy , cmy_instance )
795797
796798 self .assertRaises (
797799 ValueError , lambda : pygame .Color .from_cmy (0.5 , 0.5 , 0.5 , "lel" , "foo" )
@@ -803,11 +805,13 @@ def test_from_cmy(self):
803805 def test_from_hsva (self ):
804806 hsva = pygame .Color .from_hsva (0 , 100 , 100 , 100 )
805807 hsva_tuple = pygame .Color .from_hsva ((0 , 100 , 100 , 100 ))
808+ hsva_instance = pygame .Color (0 , 0 , 0 , 0 ).from_hsva (0 , 100 , 100 , 100 )
806809
807810 expected_hsva = (255 , 0 , 0 )
808811
809812 self .assertEqual (expected_hsva , hsva )
810813 self .assertEqual (expected_hsva , hsva_tuple )
814+ self .assertEqual (expected_hsva , hsva_instance )
811815
812816 self .assertRaises (
813817 ValueError , lambda : pygame .Color .from_hsva (0 , 100 , 100 , 100 , "lel" , "foo" )
@@ -819,11 +823,13 @@ def test_from_hsva(self):
819823 def test_from_hsla (self ):
820824 hsla = pygame .Color .from_hsla (0 , 100 , 100 , 100 )
821825 hsla_tuple = pygame .Color .from_hsla ((0 , 100 , 100 , 100 ))
826+ hsla_instance = pygame .Color (0 , 0 , 0 , 0 ).from_hsla (0 , 100 , 100 , 100 )
822827
823828 expected_hsla = (255 , 255 , 255 )
824829
825830 self .assertEqual (expected_hsla , hsla )
826831 self .assertEqual (expected_hsla , hsla_tuple )
832+ self .assertEqual (expected_hsla , hsla_instance )
827833
828834 self .assertRaises (
829835 ValueError , lambda : pygame .Color .from_hsla (0 , 100 , 100 , 100 , "lel" )
@@ -835,11 +841,13 @@ def test_from_hsla(self):
835841 def test_from_i1i2i3 (self ):
836842 i1i2i3 = pygame .Color .from_i1i2i3 (0 , 0 , 0 )
837843 i1i2i3_tuple = pygame .Color .from_i1i2i3 ((0 , 0 , 0 ))
844+ i1i2i3_instance = pygame .Color (0 , 0 , 0 , 0 ).from_i1i2i3 (0 , 0 , 0 )
838845
839846 expected_i1i2i3 = (0 , 0 , 0 )
840847
841848 self .assertEqual (expected_i1i2i3 , i1i2i3 )
842849 self .assertEqual (expected_i1i2i3 , i1i2i3_tuple )
850+ self .assertEqual (expected_i1i2i3 , i1i2i3_instance )
843851
844852 self .assertRaises (
845853 ValueError , lambda : pygame .Color .from_i1i2i3 (0 , 0 , 0 , "lel" , "foo" )
@@ -849,11 +857,13 @@ def test_from_i1i2i3(self):
849857 def test_from_normalized (self ):
850858 normal = pygame .Color .from_normalized (1 , 1 , 1 , 1 )
851859 normal_tuple = pygame .Color .from_normalized ((1 , 1 , 1 , 1 ))
860+ normal_instance = pygame .Color (0 , 0 , 0 , 0 ).from_normalized (1 , 1 , 1 , 1 )
852861
853862 expected_normal = (255 , 255 , 255 , 255 )
854863
855864 self .assertEqual (expected_normal , normal )
856865 self .assertEqual (expected_normal , normal_tuple )
866+ self .assertEqual (expected_normal , normal_instance )
857867
858868 self .assertRaises (
859869 ValueError , lambda : pygame .Color .from_normalized (1 , 1 , 1 , 1 , "lel" )
@@ -865,6 +875,11 @@ def test_from_hex(self):
865875 color3 = pygame .Color .from_hex ("#AAFF00" ) # Random
866876 color4 = pygame .Color .from_hex ("#FF000080" ) # Red (50% opacity)
867877
878+ color_instance1 = pygame .Color (0 , 0 , 0 , 0 ).from_hex ("#FFFFFF" )
879+ color_instance2 = pygame .Color (63 , 12 , 83 ).from_hex ("#000000" )
880+ color_instance3 = pygame .Color (52 , 31 , 8 , 255 ).from_hex ("#AAFF00" )
881+ color_instance4 = pygame .Color ("#E4A010" ).from_hex ("#FF000080" )
882+
868883 expected_color1 = (255 , 255 , 255 , 255 )
869884 expected_color2 = (0 , 0 , 0 , 255 )
870885 expected_color3 = (170 , 255 , 0 , 255 )
@@ -875,6 +890,11 @@ def test_from_hex(self):
875890 self .assertEqual (color3 , expected_color3 )
876891 self .assertEqual (color4 , expected_color4 )
877892
893+ self .assertEqual (color_instance1 , expected_color1 )
894+ self .assertEqual (color_instance2 , expected_color2 )
895+ self .assertEqual (color_instance3 , expected_color3 )
896+ self .assertEqual (color_instance4 , expected_color4 )
897+
878898 self .assertRaises (ValueError , lambda : pygame .Color .from_hex ("#FFFFFG" ))
879899 self .assertRaises (ValueError , lambda : pygame .Color .from_hex ("#FFFFFFF" ))
880900 self .assertRaises (ValueError , lambda : pygame .Color .from_hex ("not-a-color" ))
0 commit comments