change default_prefix from 'tbl_n_component' to 'tbl_n'

alphatwirl · Jul 8, 2017 · 4b7f82d · 4b7f82d
1 parent 604662b
commit 4b7f82d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/alphatwirl/configure/TableFileNameComposer.py b/alphatwirl/configure/TableFileNameComposer.py
@@ -11,7 +11,7 @@ class TableFileNameComposer(object):
 
     """
     def __init__(self,
-                 default_prefix = 'tbl_n_component',
+                 default_prefix = 'tbl_n',
                  default_suffix = 'txt',
                  default_var_separator = '.',
                  default_idx_separator = '-',

diff --git a/tests/unit/configure/test_TableConfigCompleter.py b/tests/unit/configure/test_TableConfigCompleter.py
@@ -55,8 +55,8 @@ def test_empty_input(self):
             sort = True,
             nevents = None,
             outFile = True,
-            outFileName = 'tbl_n_component.txt',
-            outFilePath = 'tmp/tbl_n_component.txt',
+            outFileName = 'tbl_n.txt',
+            outFilePath = 'tmp/tbl_n.txt',
         )
 
         tblcfg = dict()
@@ -84,8 +84,8 @@ def test_simple_input(self):
             sort = True,
             nevents = None,
             outFile = True,
-            outFileName = 'tbl_n_component.met_pt.txt',
-            outFilePath = 'tmp/tbl_n_component.met_pt.txt',
+            outFileName = 'tbl_n.met_pt.txt',
+            outFilePath = 'tmp/tbl_n.met_pt.txt',
         )
 
         tblcfg = dict(
@@ -116,8 +116,8 @@ def test_default_summary_class_empty_key(self):
             sort = True,
             nevents = None,
             outFile = True,
-            outFileName = 'tbl_n_component.txt',
-            outFilePath = 'tmp/tbl_n_component.txt',
+            outFileName = 'tbl_n.txt',
+            outFilePath = 'tmp/tbl_n.txt',
         )
 
         tblcfg = dict(

diff --git a/tests/unit/configure/test_TableFileNameComposer.py b/tests/unit/configure/test_TableFileNameComposer.py
@@ -9,15 +9,15 @@ def test_no_indices(self):
         actual = obj(
             columnNames = ('var1', 'var2', 'var3'),
         )
-        self.assertEqual("tbl_n_component.var1.var2.var3.txt", actual)
+        self.assertEqual("tbl_n.var1.var2.var3.txt", actual)
 
     def test_simple(self):
         obj = TableFileNameComposer()
         actual = obj(
             columnNames = ('var1', 'var2', 'var3'),
             indices = (1, None, 2)
         )
-        self.assertEqual("tbl_n_component.var1-1.var2.var3-2.txt", actual)
+        self.assertEqual("tbl_n.var1-1.var2.var3-2.txt", actual)
 
     def test_default_prefix(self):
         obj = TableFileNameComposer(default_prefix = 'tbl_Sum')
@@ -33,30 +33,30 @@ def test_default_suffix(self):
             columnNames = ('var1', 'var2', 'var3'),
             indices = (1, None, 2)
         )
-        self.assertEqual("tbl_n_component.var1-1.var2.var3-2.hdf5", actual)
+        self.assertEqual("tbl_n.var1-1.var2.var3-2.hdf5", actual)
 
     def test_empty(self):
         obj = TableFileNameComposer()
         actual = obj(
             columnNames = ( ),
             indices = ( )
         )
-        self.assertEqual("tbl_n_component.txt", actual)
+        self.assertEqual("tbl_n.txt", actual)
 
     def test_star(self):
         obj = TableFileNameComposer()
         actual = obj(
             columnNames = ('var1', 'var2', 'var3'),
             indices = (1, None, '*')
         )
-        self.assertEqual("tbl_n_component.var1-1.var2.var3-w.txt", actual)
+        self.assertEqual("tbl_n.var1-1.var2.var3-w.txt", actual)
 
     def test_backref(self):
         obj = TableFileNameComposer()
         actual = obj(
             columnNames = ('var1', 'var2', 'var3', 'var4', 'var5'),
             indices = (1, None, '*', '(*)', '\\1')
         )
-        self.assertEqual("tbl_n_component.var1-1.var2.var3-w.var4-wp.var5-b1.txt", actual)
+        self.assertEqual("tbl_n.var1-1.var2.var3-w.var4-wp.var5-b1.txt", actual)
 
 ##__________________________________________________________________||