#1226 Fix failed tests.

Author: simon-ritchie

apysc/_color/colorless.py

@@ -16,10 +16,7 @@ def __init__(self) -> None:
         The constant class for the colorlessness.
         """
 
-        suffix: str = self._get_attr_or_variable_name_suffix(
-            value_identifier="colorless"
-        )
-        super(Colorless, self).__init__(value="", variable_name_suffix=suffix)
+        super(Colorless, self).__init__(value="", variable_name_suffix="colorless")
 
 
 COLORLESS: Final[Colorless] = Colorless()

apysc/_testing/testing_helper.py

@@ -170,6 +170,9 @@ def apply_test_settings(
     """
     from apysc._display.stage import Stage
 
+    # 
+    retrying_max_attempts_num = 0
+    # 
     if retrying_sleep_seconds is None:
         retrying_sleep_seconds = randint(10, 3000) / 1000
     _validate_retrying_sleep_seconds(retrying_sleep_seconds=retrying_sleep_seconds)

apysc/_type/false.py

@@ -25,6 +25,5 @@ def __init__(self) -> None:
         - True_ and False_ constants
             - https://simon-ritchie.github.io/apysc/en/true_and_false.html
         """
-        suffix: str = self._get_attr_or_variable_name_suffix(value_identifier="false")
 
-        super(_False, self).__init__(value=False, variable_name_suffix=suffix)
+        super(_False, self).__init__(value=False, variable_name_suffix="false")

apysc/_type/true.py

@@ -25,6 +25,5 @@ def __init__(self) -> None:
         - True_ and False_ constants
             - https://simon-ritchie.github.io/apysc/en/true_and_false.html
         """
-        suffix: str = self._get_attr_or_variable_name_suffix(value_identifier="true")
 
-        super(_True, self).__init__(value=True, variable_name_suffix=suffix)
+        super(_True, self).__init__(value=True, variable_name_suffix="true")

tests/_display/test_append_line_cap_attr_expression_mixin.py

@@ -8,35 +8,46 @@
 from tests._display.test_graphics_expression import (
     assert_stroke_linecap_attr_expression_exists,
 )
+from apysc._type.variable_name_mixin import VariableNameMixIn
+from apysc._type.variable_name_suffix_attr_or_var_mixin import (
+    VariableNameSuffixAttrOrVarMixIn,
+)
+from apysc._type.variable_name_suffix_mixin import VariableNameSuffixMixIn
 
 
-class _TestMixIn(AppendLineCapAttrExpressionMixIn, LineCapMixIn):
+class _TestObject(
+    AppendLineCapAttrExpressionMixIn,
+    LineCapMixIn,
+    VariableNameMixIn,
+    VariableNameSuffixMixIn,
+    VariableNameSuffixAttrOrVarMixIn,
+):
     pass
 
 
 class TestAppendLineCapAttrExpressionMixIn:
     @apply_test_settings()
     def test__append_line_cap_attr_expression(self) -> None:
-        mixin_1: AppendLineCapAttrExpressionMixIn = AppendLineCapAttrExpressionMixIn()
+        instance_1: AppendLineCapAttrExpressionMixIn = AppendLineCapAttrExpressionMixIn()
         assert_raises(
             expected_error_class=TypeError,
-            callable_=mixin_1._append_line_cap_attr_expression,
+            callable_=instance_1._append_line_cap_attr_expression,
             match="This instance is not a ",
             expression=".attr({\n",
             indent_num=2,
             skip_appending=False,
         )
 
-        mixin_2: _TestMixIn = _TestMixIn()
-        mixin_2.line_cap = ap.LineCaps.ROUND
-        expression: str = mixin_2._append_line_cap_attr_expression(
+        instance_2: _TestObject = _TestObject()
+        instance_2.line_cap = ap.LineCaps.ROUND
+        expression: str = instance_2._append_line_cap_attr_expression(
             expression=".attr({\n",
             indent_num=2,
             skip_appending=True,
         )
         assert expression == ".attr({\n"
 
-        expression = mixin_2._append_line_cap_attr_expression(
+        expression = instance_2._append_line_cap_attr_expression(
             expression=".attr({\n",
             indent_num=2,
             skip_appending=False,

tests/_display/test_append_line_joints_attr_expression_mixin.py

@@ -8,36 +8,47 @@
 from tests._display.test_graphics_expression import (
     assert_stroke_linejoin_attr_expression_exists,
 )
+from apysc._type.variable_name_mixin import VariableNameMixIn
+from apysc._type.variable_name_suffix_attr_or_var_mixin import (
+    VariableNameSuffixAttrOrVarMixIn,
+)
+from apysc._type.variable_name_suffix_mixin import VariableNameSuffixMixIn
 
 
-class _TestMixIn(AppendLineJointsAttrExpressionMixIn, LineJointsMixIn):
+class _TestObject(
+    AppendLineJointsAttrExpressionMixIn,
+    LineJointsMixIn,
+    VariableNameMixIn,
+    VariableNameSuffixMixIn,
+    VariableNameSuffixAttrOrVarMixIn,
+):
     pass
 
 
 class TestAppendLineJointsAttrExpressionMixIn:
     @apply_test_settings()
     def test__append_line_joints_attr_expression(self) -> None:
-        mixin_1: AppendLineJointsAttrExpressionMixIn
-        mixin_1 = AppendLineJointsAttrExpressionMixIn()
+        instance_1: AppendLineJointsAttrExpressionMixIn
+        instance_1 = AppendLineJointsAttrExpressionMixIn()
         assert_raises(
             expected_error_class=TypeError,
-            callable_=mixin_1._append_line_joints_attr_expression,
+            callable_=instance_1._append_line_joints_attr_expression,
             match="This instance is not a ",
             expression=".attr({\n",
             indent_num=2,
             skip_appending=False,
         )
 
-        mixin_2: _TestMixIn = _TestMixIn()
-        mixin_2.line_joints = ap.LineJoints.ROUND
-        expression: str = mixin_2._append_line_joints_attr_expression(
+        instance_2: _TestObject = _TestObject()
+        instance_2.line_joints = ap.LineJoints.ROUND
+        expression: str = instance_2._append_line_joints_attr_expression(
             expression=".attr({\n",
             indent_num=2,
             skip_appending=True,
         )
         assert expression == ".attr({\n"
 
-        expression = mixin_2._append_line_joints_attr_expression(
+        expression = instance_2._append_line_joints_attr_expression(
             expression=".attr({\n",
             indent_num=2,
             skip_appending=False,

tests/_display/test_flip_x_mixin.py

@@ -2,9 +2,19 @@
 from apysc._display.flip_x_mixin import FlipXMixIn
 from apysc._expression import expression_data_util
 from apysc._testing.testing_helper import apply_test_settings
+from apysc._type.variable_name_mixin import VariableNameMixIn
+from apysc._type.variable_name_suffix_attr_or_var_mixin import (
+    VariableNameSuffixAttrOrVarMixIn,
+)
+from apysc._type.variable_name_suffix_mixin import VariableNameSuffixMixIn
 
 
-class _TestMixIn(FlipXMixIn):
+class _TestObject(
+    FlipXMixIn,
+    VariableNameMixIn,
+    VariableNameSuffixMixIn,
+    VariableNameSuffixAttrOrVarMixIn,
+):
     def __init__(self) -> None:
         """
         The class for the testing of the FlipXMixIn class.
@@ -15,7 +25,7 @@ def __init__(self) -> None:
 class TestFlipXMixIn:
     @apply_test_settings()
     def test__initialize_flip_x_if_not_initialized(self) -> None:
-        interface: _TestMixIn = _TestMixIn()
+        interface: _TestObject = _TestObject()
         interface._initialize_flip_x_if_not_initialized()
         assert not interface._flip_x
 
@@ -25,15 +35,15 @@ def test__initialize_flip_x_if_not_initialized(self) -> None:
 
     @apply_test_settings()
     def test_flip_x(self) -> None:
-        interface: _TestMixIn = _TestMixIn()
+        interface: _TestObject = _TestObject()
         assert not interface.flip_x
 
         interface.flip_x = ap.Boolean(True)
         assert interface.flip_x
 
     @apply_test_settings()
     def test__append_flip_x_update_expression(self) -> None:
-        interface: _TestMixIn = _TestMixIn()
+        interface: _TestObject = _TestObject()
         flip_x_1: ap.Boolean = ap.Boolean(True)
         flip_x_2: ap.Boolean = ap.Boolean(False)
         interface.flip_x = flip_x_1
@@ -52,7 +62,7 @@ def test__append_flip_x_update_expression(self) -> None:
 
     @apply_test_settings()
     def test__make_snapshot(self) -> None:
-        interface: _TestMixIn = _TestMixIn()
+        interface: _TestObject = _TestObject()
         interface.flip_x = ap.Boolean(True)
         snapshot_name: str = interface._get_next_snapshot_name()
         interface._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
@@ -66,7 +76,7 @@ def test__make_snapshot(self) -> None:
 
     @apply_test_settings()
     def test__revert(self) -> None:
-        interface: _TestMixIn = _TestMixIn()
+        interface: _TestObject = _TestObject()
         interface.flip_x = ap.Boolean(True)
         snapshot_name: str = interface._get_next_snapshot_name()
         interface._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
@@ -80,6 +90,6 @@ def test__revert(self) -> None:
 
     @apply_test_settings()
     def test__append_flip_x_attr_linking_setting(self) -> None:
-        interface: _TestMixIn = _TestMixIn()
+        interface: _TestObject = _TestObject()
         interface._initialize_flip_x_if_not_initialized()
         assert interface._attr_linking_stack["flip_x"] == [ap.Boolean(False)]

tests/_display/test_flip_y_mixin.py

@@ -2,9 +2,19 @@
 from apysc._display.flip_y_mixin import FlipYMixIn
 from apysc._expression import expression_data_util
 from apysc._testing.testing_helper import apply_test_settings
+from apysc._type.variable_name_mixin import VariableNameMixIn
+from apysc._type.variable_name_suffix_attr_or_var_mixin import (
+    VariableNameSuffixAttrOrVarMixIn,
+)
+from apysc._type.variable_name_suffix_mixin import VariableNameSuffixMixIn
 
 
-class _TestInterface(FlipYMixIn):
+class _TestObject(
+    FlipYMixIn,
+    VariableNameMixIn,
+    VariableNameSuffixMixIn,
+    VariableNameSuffixAttrOrVarMixIn,
+):
     def __init__(self) -> None:
         """
         The class for the testing of the FlipYMixIn.
@@ -15,59 +25,59 @@ def __init__(self) -> None:
 class TestFlipYMixIn:
     @apply_test_settings()
     def test__initialize_flip_y_if_not_initialized(self) -> None:
-        interface: _TestInterface = _TestInterface()
-        interface._initialize_flip_y_if_not_initialized()
-        assert not interface._flip_y
+        instance: _TestObject = _TestObject()
+        instance._initialize_flip_y_if_not_initialized()
+        assert not instance._flip_y
 
-        interface._flip_y._value = True
-        interface._initialize_flip_y_if_not_initialized()
-        assert interface._flip_y
+        instance._flip_y._value = True
+        instance._initialize_flip_y_if_not_initialized()
+        assert instance._flip_y
 
     @apply_test_settings()
     def test_flip_y(self) -> None:
-        interface: _TestInterface = _TestInterface()
-        assert not interface.flip_y
+        instance: _TestObject = _TestObject()
+        assert not instance.flip_y
 
-        interface.flip_y = ap.Boolean(True)
-        assert interface.flip_y
+        instance.flip_y = ap.Boolean(True)
+        assert instance.flip_y
 
     @apply_test_settings()
     def test__append_flip_y_update_expression(self) -> None:
-        interface: _TestInterface = _TestInterface()
-        interface.flip_y = ap.Boolean(True)
+        instance: _TestObject = _TestObject()
+        instance.flip_y = ap.Boolean(True)
         expression: str = expression_data_util.get_current_expression()
         assert '.flip("y");' in expression
 
     @apply_test_settings()
     def test__make_snapshot(self) -> None:
-        interface: _TestInterface = _TestInterface()
-        interface.flip_y = ap.Boolean(True)
-        snapshot_name: str = interface._get_next_snapshot_name()
-        interface._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
-        if interface._flip_y_snapshots is None:
+        instance: _TestObject = _TestObject()
+        instance.flip_y = ap.Boolean(True)
+        snapshot_name: str = instance._get_next_snapshot_name()
+        instance._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
+        if instance._flip_y_snapshots is None:
             raise AssertionError()
-        assert interface._flip_y_snapshots[snapshot_name]
+        assert instance._flip_y_snapshots[snapshot_name]
 
-        interface.flip_y = ap.Boolean(False)
-        interface._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
-        assert interface._flip_y_snapshots[snapshot_name]
+        instance.flip_y = ap.Boolean(False)
+        instance._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
+        assert instance._flip_y_snapshots[snapshot_name]
 
     @apply_test_settings()
     def test__revert(self) -> None:
-        interface: _TestInterface = _TestInterface()
-        interface.flip_y = ap.Boolean(True)
-        snapshot_name: str = interface._get_next_snapshot_name()
-        interface._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
-        interface.flip_y = ap.Boolean(False)
-        interface._run_all_revert_methods(snapshot_name=snapshot_name)
-        assert interface.flip_y
+        instance: _TestObject = _TestObject()
+        instance.flip_y = ap.Boolean(True)
+        snapshot_name: str = instance._get_next_snapshot_name()
+        instance._run_all_make_snapshot_methods(snapshot_name=snapshot_name)
+        instance.flip_y = ap.Boolean(False)
+        instance._run_all_revert_methods(snapshot_name=snapshot_name)
+        assert instance.flip_y
 
-        interface.flip_y = ap.Boolean(False)
-        interface._run_all_revert_methods(snapshot_name=snapshot_name)
-        assert not interface.flip_y
+        instance.flip_y = ap.Boolean(False)
+        instance._run_all_revert_methods(snapshot_name=snapshot_name)
+        assert not instance.flip_y
 
     @apply_test_settings()
     def test__append_flip_y_attr_linking_setting(self) -> None:
-        interface: _TestInterface = _TestInterface()
-        interface._initialize_flip_y_if_not_initialized()
-        assert interface._attr_linking_stack["flip_y"] == [ap.Boolean(False)]
+        instance: _TestObject = _TestObject()
+        instance._initialize_flip_y_if_not_initialized()
+        assert instance._attr_linking_stack["flip_y"] == [ap.Boolean(False)]

tests/_display/test_svg_foreign_object_initialize_width_mixin.py

@@ -4,11 +4,18 @@
 from apysc._display.width_mixin import WidthMixIn
 from apysc._testing.testing_helper import apply_test_settings
 from apysc._type.variable_name_suffix_mixin import VariableNameSuffixMixIn
+from apysc._type.variable_name_mixin import VariableNameMixIn
+from apysc._type.variable_name_suffix_attr_or_var_mixin import (
+    VariableNameSuffixAttrOrVarMixIn,
+)
+from apysc._type.variable_name_suffix_mixin import VariableNameSuffixMixIn
 
 
 class _TestObject(
     WidthMixIn,
+    VariableNameMixIn,
     VariableNameSuffixMixIn,
+    VariableNameSuffixAttrOrVarMixIn,
     SvgForeignObjectInitializeWidthMixIn,
 ):
     def __init__(self) -> None:

tests/_geom/test_path_data_base.py

@@ -25,7 +25,7 @@ def test__get_svg_char(self) -> None:
         svg_char: ap.String = path_data._get_svg_char()
         assert svg_char == "M"
         assert isinstance(svg_char, ap.String)
-        assert svg_char._variable_name_suffix == "test_path_data"
+        assert svg_char._variable_name_suffix == "test_path_data__svg_char"
         expression: str = expression_data_util.get_current_expression()
         assert "if (" in expression
         assert "else {" in expression