Renamed VARNAME_re to re_VARNAME

[moe.git] / t / moe / conf.test.py

diff --git a/t/moe/conf.test.py b/t/moe/conf.test.py
index d43a129d20302de55884ab1ecd23166367cf2a77..a630e61619f0ddd83a6cd9eb2ed6811e9f86e59b 100644 (file)
--- a/t/moe/conf.test.py
+++ b/t/moe/conf.test.py
@@ -7,33 +7,25 @@ vcnt = 3
 def cs(s):
   return conf.ConfigExpression([s], s)
 
-root = conf.ConfigTree(None, None)
-t_a = conf.ConfigTree('a', root)
-t_a_b = conf.ConfigTree('b', t_a)
-t_c = conf.ConfigTree('c', root)
+root = conf.ConfigTree()
 
-v_r = conf.ConfigVar('r', root)
-v_r.add_operation('SET', [], cs('ROOTVAR'))
-
-v_a = []
-v_b = []
 for i in range(vcnt):
-  v_a.append(conf.ConfigVar('va%d'%i, t_a))
-  v_a[i].add_operation('SET', [], cs('VALUE-A%d'%i))
-
-  v_b.append(conf.ConfigVar('vb%d'%i, t_a_b))
-  v_b[i].add_operation('APPEND', [], cs(' FOO'))
-  v_b[i].add_operation('SET', [], conf.ConfigExpression([v_a[i]], '{va%d}'%i))
-  v_b[i].add_operation('APPEND', [], cs(' BAR'))
-  if i>0: 
-    v_b[i].add_operation('APPEND', [], conf.ConfigExpression([' ', v_b[i-1]], ' {vb%d}'%(i-1)))
-print '\n'.join(root.pprint())
-
-v_b[0].remove_operation(1)
-v_b[0].add_operation('SET', [], cs('NEW-VALUE'))
-v_b[1].add_operation('APPEND', [], cs(' NEW-ADDED'))
-v_a[1].add_operation('APPEND', [], cs(' NEW-ADDED-A'))
-print '\n'.join(root.pprint())
-
-v_a[0].add_operation('SET', [], cs('NEW-VALUE-A0'))
-print '\n'.join(root.pprint())
+  root.lookup('a.v%d'%i).add_operation('SET', None, cs('A%d'%i))
+  b = root.lookup('b.v%d'%i)
+  b.add_operation('APPEND', None, cs(' <FOO>'))
+  b.add_operation('SET', None, conf.ConfigExpression([root.lookup('a.v%d'%i)], '{a.v%d}'%i))
+  b.add_operation('APPEND', None, cs(' <BAR>'))
+  if i<vcnt-1: 
+    b.add_operation('APPEND', [], conf.ConfigExpression([' [', root.lookup('b.v%d'%(i+1)), ']'], ' [{b.v%d}]'%(i+1)))
+print '\n'.join(root.dump())
+
+b0 = root.lookup('b.v0')
+b0.remove_operation(1)
+b0.add_operation('SET', None, cs('NEW-B0'))
+root.lookup('b.v2').add_operation('APPEND', None, cs(' <NEW-B3>'))
+root.lookup('a.v1').add_operation('APPEND', None, cs(' <NEW-A1>'))
+print '\n'.join(root.dump())
+
+root.lookup('a.v0').add_operation('SET', [], cs('<OVERRIDE-A0>'))
+print '\n'.join(root.dump())
+print 'maxdepth: %d'%conf.debug_maxdepth