Fix typo in _get_untyped_sites (#575)

* fix typo * rename test_get_untyped * fix minor typo
mosdef-hub · Jul 21, 2021 · 00f329c · 00f329c
1 parent 69e8d0d
commit 00f329c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/gmso/core/topology.py b/gmso/core/topology.py
@@ -790,12 +790,12 @@ def get_untyped(self, group):
         }
         if group == "topology":
             for subgroup in untyped_extractors:
-                untyped.update(untyped_extractors[subgroup])
-        elif group in untyped_extractors:
-            untyped = untyped_extractors[group]()
+                untyped.update(untyped_extractors[subgroup]())
         elif isinstance(group, (list, tuple, set)):
             for subgroup in group:
                 untyped.update(untyped_extractors[subgroup]())
+        elif isinstance(group, str) and group in untyped_extractors:
+            untyped = untyped_extractors[group]()
         else:
             raise ValueError(
                 f"Cannot get untyped {group}. "
@@ -808,7 +808,7 @@ def _get_untyped_sites(self):
         untyped = {"sites": list()}
         for site in self._sites:
             if not site.atom_type:
-                untyped[sites].append(site)
+                untyped["sites"].append(site)
         return untyped
 
     def _get_untyped_bonds(self):

diff --git a/gmso/tests/test_topology.py b/gmso/tests/test_topology.py
@@ -736,7 +736,7 @@ def test_is_typed_check(self, typed_chloroethanol):
         with pytest.raises(ValueError):
             typed_chloroethanol.is_fully_typed(group="foo")
 
-    def get_untyped(self, typed_chloroethanol):
+    def test_cget_untyped(self, typed_chloroethanol):
         # Note impropers list is empty, and hence is not tested here
         groups = ["sites", "bonds", "angles", "dihedrals"]
         clone = deepcopy(typed_chloroethanol)
@@ -748,8 +748,8 @@ def get_untyped(self, typed_chloroethanol):
         full_opt = clone.get_untyped(group="topology")
         for group in groups:
             assert not clone.is_fully_typed(group=group)
-            assert len(clone.get_untyped(group=group)) == 1
-            assert len(full_opt[group] == 1)
+            assert len(clone.get_untyped(group=group)[group]) == 1
+            assert len(full_opt[group]) == 1
 
         # Get multiple untyped
         untyped_sites_angles = clone.get_untyped(group=["sites", "angles"])