update tests

Author: mikemoritz

synapse/lib/stormtypes.py

@@ -2596,7 +2596,7 @@ class LibLift(Lib):
         {'name': 'byNodeData', 'desc': 'Lift nodes which have a given nodedata name set on them.',
          'type': {'type': 'function', '_funcname': '_byNodeData',
                   'args': (
-                      {'name': 'name', 'desc': 'The name to of the nodedata key to lift by.', 'type': 'str', },
+                      {'name': 'name', 'desc': 'The name of the nodedata key to lift by.', 'type': 'str', },
                   ),
                   'returns': {'name': 'Yields', 'type': 'node',
                               'desc': 'Yields nodes to the pipeline. '

synapse/tests/test_lib_ast.py

@@ -3435,19 +3435,19 @@ async def test_ast_highlight(self):
             self.eq('obj.put(foo, bar, baz)', text[off:end])
             self.stormIsInErr('pipe.put()', msgs)
 
-            text = '$lib.gen.campaign(foo, bar, baz)'
+            text = '$lib.lift.byNodeData(foo, bar, baz)'
             msgs = await core.stormlist(text)
             errm = [m for m in msgs if m[0] == 'err'][0]
             off, end = errm[1][1]['highlight']['offsets']
-            self.eq('lib.gen.campaign(foo, bar, baz)', text[off:end])
-            self.stormIsInErr('$lib.gen.campaign()', msgs)
+            self.eq('lib.lift.byNodeData(foo, bar, baz)', text[off:end])
+            self.stormIsInErr('$lib.lift.byNodeData()', msgs)
 
-            text = '$gen = $lib.gen.campaign $gen(foo, bar, baz)'
+            text = '$lft = $lib.lift.byNodeData $lft(foo, bar, baz)'
             msgs = await core.stormlist(text)
             errm = [m for m in msgs if m[0] == 'err'][0]
             off, end = errm[1][1]['highlight']['offsets']
-            self.eq('gen(foo, bar, baz)', text[off:end])
-            self.stormIsInErr('$lib.gen.campaign()', msgs)
+            self.eq('lft(foo, bar, baz)', text[off:end])
+            self.stormIsInErr('$lib.lift.byNodeData()', msgs)
 
             async def highlighteq(exp, text):
                 msgs = await core.stormlist(text)

synapse/tests/test_lib_storm.py

@@ -4324,12 +4324,12 @@ async def test_storm_help_cmd(self):
             msgs = await core.stormlist('$str=hehe help $str.split')
             self.stormIsInPrint('Split the string into multiple parts based on a separator.', msgs)
 
-            msgs = await core.stormlist('help $lib.gen.orgByName')
-            self.stormIsInPrint('Returns an ou:org by name, adding the node if it does not exist.', msgs)
+            msgs = await core.stormlist('help $lib.lift.byNodeData')
+            self.stormIsInPrint('Lift nodes which have a given nodedata name set on them.', msgs)
 
-            msgs = await core.stormlist('help --verbose $lib.gen.orgByName')
-            self.stormIsInPrint('Returns an ou:org by name, adding the node if it does not exist.\n'
-                                'Args:\n    name (str): The name of the org.', msgs)
+            msgs = await core.stormlist('help --verbose $lib.lift.byNodeData')
+            self.stormIsInPrint('Lift nodes which have a given nodedata name set on them.\n'
+                                'Args:\n    name (str): The name of the nodedata key to lift by.', msgs)
 
             orig = s_stormtypes.registry.getLibDocs
             def forcedep(cls):

synapse/tests/test_model_entity.py

@@ -126,7 +126,7 @@ async def test_model_entity(self):
                     :desc=Hehe
                     :tag=woot.woot
                     :sophistication=high
-                    :reporter=$lib.gen.orgByName(vertex)
+                    :reporter={[ ou:org=({"name": "vertex"}) ]}
                     :reporter:name=vertex
                     :parent={[ meta:technique=* :name=metawoot ]}
                 ]

synapse/tests/test_model_infotech.py

@@ -513,7 +513,7 @@ async def test_it_forms_simple(self):
             self.len(1, await core.nodes('it:log:event :service:account -> inet:service:account'))
             self.len(1, await core.nodes('it:log:event :service:platform -> inet:service:platform'))
 
-            nodes = await core.nodes('it:host | limit 1 | [ :keyboard:layout=qwerty :keyboard:language=$lib.gen.langByCode(en.us) ]')
+            nodes = await core.nodes('it:host | limit 1 | [ :keyboard:layout=qwerty :keyboard:language={[ lang:language=({"code": "en.us"}) ]} ]')
             self.len(1, nodes)
             self.nn(nodes[0].get('keyboard:language'))
             self.len(1, await core.nodes('it:host:keyboard:layout=QWERTY'))

synapse/tests/test_model_language.py

@@ -30,10 +30,6 @@ async def test_model_language(self):
             self.len(1, await core.nodes('lang:translation -> it:software'))
             self.len(2, await core.nodes('lang:translation -> lang:language'))
 
-            self.none(await core.callStorm('return($lib.gen.langByCode(neeeeewp, try=$lib.true))'))
-            with self.raises(s_exc.BadTypeValu):
-                await core.callStorm('return($lib.gen.langByCode(neeeeewp))')
-
             nodes = await core.nodes('[ lang:phrase="For   The  People" ]')
             self.len(1, nodes)
             self.eq('For   The  People', nodes[0].repr())

synapse/tests/test_model_transport.py

@@ -136,6 +136,13 @@ async def test_model_transport(self):
             nodes = await core.nodes('''
                 $regid = $lib.guid()
 
+                $contact = {[
+                    entity:contact=({
+                        "type": "us.va.dmv",
+                        "email": "visi@vertex.link",
+                    })
+                ]}
+
                 [ transport:land:registration=$regid
 
                     :id=zeroday
@@ -144,23 +151,23 @@ async def test_model_transport(self):
                     :issuer={gen.ou.org "virginia dmv"}
                     :issuer:name="virginia dmv"
 
-                    :contact={gen.ps.contact.email us.va.dmv visi@vertex.link}
+                    :contact=$contact
 
                     :vehicle={[ transport:land:vehicle=*
                         :serial=V-31337
                         :built=2005
                         :model=elise
                         :registration=$regid
                         :type=car
-                        :owner={gen.ps.contact.email us.va.dmv visi@vertex.link}
+                        :owner=$contact
                     ]}
 
                     :license={[ transport:land:license=*
                         :id=V-31337
-                        :contact={gen.ps.contact.email us.va.dmv visi@vertex.link}
+                        :contact=$contact
                         :issued=20221217
                         :expires=20251217
-                        :issuer={gen.ou.org "virginia dmv"}
+                        :issuer={[ ou:org=({"name": "virginia dmv"}) ]}
                         :issuer:name="virginia dmv"
                     ]}
                 ]