tests for improved dir()

wlav · Feb 10, 2022 · f4446b3 · f4446b3
1 parent 9bf3a2f
commit f4446b3
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 2 deletions.
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -18,6 +18,7 @@ master: 2.3.0
 * Support for (multiple and nested) anonymous structs
 * Pull forward upstream patch for PPC
 * Only apply system_dirs patch (for asan) on Linux
+* Add unloaded classes to namespaces in dir()
 
 
 2021-11-14: 2.2.0

diff --git a/test/test_fragile.py b/test/test_fragile.py
@@ -225,8 +225,59 @@ def test11_dir(self):
 
         # TODO: think this through ... probably want this, but interferes with
         # the (new) policy of lazy lookups
-        #assert 'fglobal' in members          # function
-        #assert 'gI'in members                # variable
+        #assert 'fglobal' in members         # function
+        assert 'gI'in members                # variable
+
+      # GetAllCppNames() behaves differently from python dir() but providing the full
+      # set, which is then filtered in dir(); check both
+        cppyy.cppdef("""\
+        #ifdef _MSC_VER
+        #define CPPYY_IMPORT extern __declspec(dllimport)
+        #else
+        #define CPPYY_IMPORT extern
+        #endif
+
+        namespace Cppyy {
+
+        typedef size_t TCppScope_t;
+
+        CPPYY_IMPORT TCppScope_t GetScope(const std::string& scope_name);
+        CPPYY_IMPORT void GetAllCppNames(TCppScope_t scope, std::set<std::string>& cppnames);
+
+        }""")
+
+        cppyy.cppdef("""\
+        namespace GG {
+        struct S {
+          int _a;
+          int _c;
+          S(int a, int c): _a{a}, _c{c} { }
+          S(): _a{0}, _c{0} { }
+          bool operator<(int i) { return i < (_a+_c); }
+        }; }""");
+
+
+        assert 'S' in dir(cppyy.gbl.GG)
+
+        handle = cppyy.gbl.Cppyy.GetScope("GG::S")
+        assert handle
+
+        cppnames = cppyy.gbl.std.set[str]()
+        cppyy.gbl.Cppyy.GetAllCppNames(handle, cppnames)
+
+        assert 'S' in cppnames
+        assert '_a' in cppnames
+        assert '_c' in cppnames
+
+        assert 'operator<' in cppnames
+
+        dirS = dir(cppyy.gbl.GG.S)
+
+        assert 'S' not in dirS # is __init__
+        assert '_a' in dirS
+        assert '_c' in dirS
+
+        assert 'operator<' not in dirS
 
     def test12_imports(self):
         """Test ability to import from namespace (or fail with ImportError)"""