set suite names, metadata correctly

yanne · yanne · commit 36cc268cbd8e · 2019-05-30T19:01:24.000+03:00
diff --git a/src/robot/parsing/newparser/nodes.py b/src/robot/parsing/newparser/nodes.py
@@ -104,10 +104,17 @@ def __init__(self, name, args):
         self.args = args
 
 
+class MetadataSetting(Node):
+    _fields = ('name', 'value')
+
+    def __init__(self, name, value):
+        self.name = name
+        self.value = value
+
+
 class DocumentationSetting(Setting): pass
 class SuiteSetupSetting(Setting): pass
 class SuiteTeardownSetting(Setting): pass
-class MetadataSetting(Setting): pass
 class TestSetupSetting(Setting): pass
 class TestTeardownSetting(Setting): pass
 class TestTemplateSetting(Setting): pass
diff --git a/src/robot/parsing/newparser/parser.py b/src/robot/parsing/newparser/parser.py
@@ -77,7 +77,7 @@ def p_suite_teardown(self, p):
 
     def p_metadata(self, p):
         '''metadata_setting : METADATA arguments'''
-        p[0] = MetadataSetting(p[2])
+        p[0] = MetadataSetting(p[2][0], p[2][1:])
 
     def p_test_setup(self, p):
         '''test_setup_setting : TEST_SETUP arguments'''
diff --git a/src/robot/running/newbuilder.py b/src/robot/running/newbuilder.py
@@ -24,6 +24,9 @@ def __init__(self, suite, test_defaults):
     def visit_DocumentationSetting(self, node):
         self.suite.doc = "\n".join(node.value)
 
+    def visit_MetadataSetting(self, node):
+        self.suite.metadata[node.name] = ' '.join(node.value)
+
     def visit_SuiteSetupSetting(self, node):
         self.suite.keywords.append(create_fixture(node.value, 'setup'))
 
@@ -275,18 +278,19 @@ def _parse_and_build(self, path):
         if os.path.isdir(path):
             init_file, children = self._get_children(path)
             if init_file:
-                suite = self._build_suite(self._parse(init_file))
+                suite = self._build_suite(init_file)
             else:
-                suite = TestSuite()
+                suite = TestSuite(name=format_name(path), source=path)
             for c in children:
                 suite.suites.append(self._parse_and_build(c))
         else:
-            suite = self._build_suite(self._parse(path))
+            suite = self._build_suite(path)
         suite.remove_empty_suites()
         return suite
 
-    def _build_suite(self, data, parent_defaults=None):
-        suite = TestSuite()
+    def _build_suite(self, source, parent_defaults=None):
+        data = self._parse(source)
+        suite = TestSuite(name=format_name(source), source=source)
         defaults = TestDefaults()
         SettingsBuilder(suite, defaults).visit(data)
         SuiteBuilder(suite, defaults).visit(data)
@@ -381,3 +385,16 @@ def build(self, path):
         data = Builder().read(abspath(path))
         ResourceBuilder(resource).visit(data)
         return resource
+
+
+def format_name(source):
+    def strip_possible_prefix_from_name(name):
+        return name.split('__', 1)[-1]
+
+    def format_name(name):
+        name = strip_possible_prefix_from_name(name)
+        name = name.replace('_', ' ').strip()
+        return name.title() if name.islower() else name
+
+    basename = os.path.splitext(os.path.basename(source))[0]
+    return format_name(basename)
