test: fix broken tests

Let's do the string replacement upfront to get it out of the way.
Else if remove_defaults_impl returns None, the name might not always be cleaned up

Author: iMichka

.github/workflows/tests.yml

@@ -190,4 +190,4 @@ jobs:
       - name: Run tests
         run: |
           export PATH=~/castxml/bin:$PATH
-          pytest tests/test_remove_template_defaults.py
+          pytest tests

src/pygccxml/declarations/container_traits.py

@@ -38,7 +38,8 @@ def __init__(self, unordered_maps_and_sets):
     def normalize(self, type_str):
         return type_str.replace(' ', '')
 
-    def replace_basic_string(self, cls_name):
+    @staticmethod
+    def replace_basic_string(cls_name):
         strings = {
             "std::string": string_equivalences,
             "std::wstring": wstring_equivalences
@@ -48,7 +49,6 @@ def replace_basic_string(self, cls_name):
         for short_name, long_names in strings.items():
             for lname in long_names:
                 new_name = new_name.replace(lname, short_name)
-
         return new_name
 
     def decorated_call_prefix(self, cls_name, text, doit):
@@ -99,7 +99,6 @@ def erase_recursive(self, cls_name):
         return self.no_end_const(cls_name)
 
     def erase_allocator(self, cls_name, default_allocator='std::allocator'):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 2:
             return
@@ -116,8 +115,8 @@ def erase_allocator(self, cls_name, default_allocator='std::allocator'):
                 c_name, [self.erase_recursive(value_type)])
 
     def erase_container(self, cls_name, default_container_name='std::deque'):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
+        print("erase_container", cls_name, c_name)
         if len(c_args) != 2:
             return
         value_type = c_args[0]
@@ -132,7 +131,6 @@ def erase_container_compare(
             cls_name,
             default_container_name='std::vector',
             default_compare='std::less'):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 3:
             return
@@ -152,7 +150,6 @@ def erase_compare_allocator(
             cls_name,
             default_compare='std::less',
             default_allocator='std::allocator'):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 3:
             return
@@ -175,7 +172,6 @@ def erase_map_compare_allocator(
             cls_name,
             default_compare='std::less',
             default_allocator='std::allocator'):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 4:
             return
@@ -205,7 +201,6 @@ def erase_map_compare_allocator(
                      self.erase_recursive(mapped_type)])
 
     def erase_hash_allocator(self, cls_name):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) < 3:
             return
@@ -243,7 +238,6 @@ def erase_hash_allocator(self, cls_name):
                     c_name, [self.erase_recursive(value_type)])
 
     def erase_hashmap_compare_allocator(self, cls_name):
-        cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
 
         if self.unordered_maps_and_sets:
@@ -523,6 +517,7 @@ def remove_defaults(self, type_or_string):
         name = type_or_string
         if not isinstance(type_or_string, str):
             name = self.class_declaration(type_or_string).name
+        name = defaults_eraser.replace_basic_string(name)
         if not self.remove_defaults_impl:
             return name
         no_defaults = self.remove_defaults_impl(name)

tests/test_remove_template_defaults.py

@@ -4,7 +4,6 @@
 # See http://www.boost.org/LICENSE_1_0.txt
 
 import platform
-import logging
 import pytest
 
 from . import autoconfig
@@ -17,8 +16,6 @@
     'remove_template_defaults.hpp'
 ]
 
-utils.loggers.set_level(logging.DEBUG)
-
 
 @pytest.fixture
 def global_ns():