tests: fix macos tests

Author: iMichka

.github/workflows/tests.yml

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

pyproject.toml

@@ -64,3 +64,7 @@ docs = [
 examples = [
   "notebook",
 ]
+[tool.pytest.ini_options]
+pythonpath = [
+  "src"
+]

src/pygccxml/declarations/container_traits.py

@@ -29,7 +29,6 @@ def normalize(self, type_str):
         return type_str.replace(' ', '')
 
     def replace_basic_string(self, cls_name):
-
         # Take the lists of all possible string variations
         # and clean them up by replacing ::std by std.
         str_eq = [
@@ -102,7 +101,7 @@ 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
+            return cls_name
         value_type = c_args[0]
         tmpl = string.Template(
             "$container< $value_type, $allocator<$value_type> >")
@@ -119,12 +118,12 @@ 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)
         if len(c_args) != 2:
-            return
+            return cls_name
         value_type = c_args[0]
         dc_no_defaults = self.erase_recursive(c_args[1])
         if self.normalize(dc_no_defaults) != self.normalize(
                 templates.join(default_container_name, [value_type])):
-            return
+            return cls_name
         return templates.join(
             c_name, [self.erase_recursive(value_type)])
 
@@ -136,7 +135,7 @@ def erase_container_compare(
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 3:
-            return
+            return cls_name
         dc_no_defaults = self.erase_recursive(c_args[1])
         if self.normalize(dc_no_defaults) != self.normalize(
                 templates.join(default_container_name, [c_args[0]])):
@@ -156,7 +155,7 @@ def erase_compare_allocator(
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 3:
-            return
+            return cls_name
         value_type = c_args[0]
         tmpl = string.Template(
             "$container< $value_type, $compare<$value_type>, " +
@@ -179,7 +178,7 @@ def erase_map_compare_allocator(
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 4:
-            return
+            return cls_name
         key_type = c_args[0]
         mapped_type = c_args[1]
         tmpls = [
@@ -209,7 +208,7 @@ 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
+            return cls_name
 
         default_less = 'std::less'
         default_equal_to = 'std::equal_to'
@@ -226,7 +225,7 @@ def erase_hash_allocator(self, cls_name):
                 "$container< $value_type, $hash<$value_type >, " +
                 "$equal_to<$value_type >, $allocator<$value_type> >")
         else:
-            return
+            return cls_name
 
         value_type = c_args[0]
         template = string.Template(tmpl)
@@ -258,7 +257,7 @@ def erase_hashmap_compare_allocator(self, cls_name):
             key_type = c_args[0]
             mapped_type = c_args[1]
         else:
-            return
+            return cls_name
 
         if len(c_args) == 4:
             default_hash = 'hash_compare'
@@ -305,7 +304,7 @@ def erase_hashmap_compare_allocator(self, cls_name):
                         "$equal_to<$key_type>, " +
                         "$allocator< $mapped_type > >")
         else:
-            return
+            return cls_name
 
         for ns in std_namespaces:
             inst = tmpl.substitute(
@@ -520,14 +519,13 @@ def remove_defaults(self, type_or_string):
                std::vector< int >
 
         """
-
         name = type_or_string
         if not isinstance(type_or_string, str):
             name = self.class_declaration(type_or_string).name
         if not self.remove_defaults_impl:
             return name
         no_defaults = self.remove_defaults_impl(name)
-        if not no_defaults:
+        if no_defaults is None:
             return name
         return no_defaults
 

src/pygccxml/declarations/type_traits.py

@@ -482,22 +482,32 @@ def is_fundamental(type_):
 
 string_equivalences = [
     (
-        '::std::basic_string<char,std::char_traits<char>,'
+        'std::basic_string<char, std::char_traits<char>, '
+        'std::allocator<char>>, '
+        'std::allocator<std::basic_string<'
+        'char, std::char_traits<char>, std::allocator<char>>>'),
+    (
+        '::std::basic_string<char, std::char_traits<char>, '
         'std::allocator<char>>'),
     '::std::basic_string<char>', '::std::string']
 
 wstring_equivalences = [
     (
-        '::std::basic_string<wchar_t,std::char_traits<wchar_t>,' +
+        'std::basic_string<wchar_t, std::char_traits<wchar_t>, '
+        'std::allocator<wchar_t>>, '
+        'std::allocator<std::basic_string<'
+        'wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>>'),
+    (
+        '::std::basic_string<wchar_t, std::char_traits<wchar_t>, '
         'std::allocator<wchar_t>>'),
     '::std::basic_string<wchar_t>', '::std::wstring']
 
 ostream_equivalences = [
-    '::std::basic_ostream<char,std::char_traits<char>>',
+    '::std::basic_ostream<char std::char_traits<char>>',
     '::std::basic_ostream<char>', '::std::ostream']
 
 wostream_equivalences = [
-    '::std::basic_ostream<wchar_t,std::char_traits<wchar_t>>',
+    '::std::basic_ostream<wchar_t, std::char_traits<wchar_t>>',
     '::std::basic_ostream<wchar_t>', '::std::wostream']
 
 

tests/test_find_container_traits.py

@@ -33,7 +33,6 @@ def __cmp_traits(global_ns, typedef, expected, partial_name, key_type=None):
     assert declarations.find_container_traits(cls) == expected
     assert cls.partial_name == partial_name
     cls = traits.class_declaration(cls)
-    print("xxxx", traits, typedef)
     assert traits.element_type(typedef) is not None
     assert cls.cache.container_element_type is not None
 
@@ -51,91 +50,91 @@ def test_find_traits(global_ns):
         global_ns,
         "v_int",
         declarations.vector_traits,
-        "vector< int >"
+        "vector<int>"
     )
     __cmp_traits(
         global_ns,
         "l_int",
         declarations.list_traits,
-        "list< int >"
+        "list<int>"
     )
     __cmp_traits(
         global_ns, "d_v_int",
         declarations.deque_traits,
-        "deque< std::vector< int > >"
+        "deque<std::vector<int>>"
     )
     __cmp_traits(
         global_ns, "q_int",
         declarations.queue_traits,
-        "queue< int >"
+        "queue<int>"
     )
     __cmp_traits(
         global_ns, "pq_int",
         declarations.priority_queue_traits,
-        "priority_queue< int >"
+        "priority_queue<int>"
     )
     __cmp_traits(
         global_ns, "s_v_int",
         declarations.set_traits,
-        "set< std::vector< int > >"
+        "set<std::vector<int>>"
     )
     __cmp_traits(
         global_ns,
         "ms_v_int",
         declarations.multiset_traits,
-        "multiset< std::vector< int > >",
+        "multiset<std::vector<int>>",
     )
     __cmp_traits(
         global_ns, "m_i2d",
         declarations.map_traits,
-        "map< int, double >",
+        "map<int, double>",
         "int"
     )
     __cmp_traits(
         global_ns,
         "mm_i2d",
         declarations.multimap_traits,
-        "multimap< int, double >",
+        "multimap<int, double>",
         "int",
     )
     __cmp_traits(
         global_ns,
         "hs_v_int",
         declarations.unordered_set_traits,
-        "unordered_set< std::vector< int > >",
+        "unordered_set<std::vector<int>>",
     )
     __cmp_traits(
         global_ns,
         "mhs_v_int",
         declarations.unordered_multiset_traits,
-        "unordered_multiset< std::vector< int > >",
+        "unordered_multiset<std::vector<int>>",
     )
     __cmp_traits(
         global_ns,
         "hm_i2d",
         declarations.unordered_map_traits,
-        "unordered_map< int, double >",
+        "unordered_map<int, double>",
         "int",
     )
     __cmp_traits(
         global_ns,
         "hmm_i2d",
         declarations.unordered_multimap_traits,
-        "unordered_multimap< int, double >",
+        "unordered_multimap<int, double>",
         "int",
     )
 
 
 def test_multimap(global_ns):
     m = global_ns.class_(lambda decl: decl.name.startswith("multimap"))
     declarations.find_container_traits(m)
-    assert m.partial_name == "multimap< int, int >"
+    assert m.partial_name == "multimap<int, int>"
 
 
 def test_recursive_partial_name(global_ns):
     f1 = global_ns.free_function("f1")
     t1 = declarations.class_traits.get_declaration(f1.arguments[0].decl_type)
-    assert "type< std::set< std::vector< int > > >" == t1.partial_name
+    assert "type<std::set<std::vector<int>>>" == t1.partial_name
 
 
 def test_remove_defaults_partial_name_namespace(global_ns):
@@ -154,7 +153,7 @@ def test_from_ogre():
         "map<std::string, bool (*)(std::string&, "
         + "Ogre::MaterialScriptContext&), std::less<std::string>, "
         + "std::allocator<std::pair<std::string const, bool (*)"
-        + "(std::string&, Ogre::MaterialScriptContext&)> > >"
+        + "(std::string&, Ogre::MaterialScriptContext&)>>>"
     )
     ct = declarations.find_container_traits(x)
     ct.remove_defaults(x)