SEBA-282 xosgenx filtering by app or model;
provide a default argument class for XOSProcessor;
remove tabs;
rename unit tests missed by nose2
Change-Id: I07b782982b6733f8828b8a5a72807326f430b1a5
diff --git a/lib/xos-genx/xos-genx-tests/test_django_generator.py b/lib/xos-genx/xos-genx-tests/test_django_generator.py
index d2b3c8a..4f4dae4 100644
--- a/lib/xos-genx/xos-genx-tests/test_django_generator.py
+++ b/lib/xos-genx/xos-genx-tests/test_django_generator.py
@@ -16,8 +16,7 @@
import unittest
import os
-from xosgenx.generator import XOSProcessor
-from helpers import FakeArgs
+from xosgenx.generator import XOSProcessor, XOSProcessorArgs
VROUTER_XPROTO = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/xproto/vrouterport.xproto")
@@ -27,9 +26,8 @@
"""
[XOS-GenX] Generate DJANGO models, verify Fields and Foreign Keys
"""
- args = FakeArgs()
- args.files = [VROUTER_XPROTO]
- args.target = 'django.xtarget'
+ args = XOSProcessorArgs(files = [VROUTER_XPROTO],
+ target = 'django.xtarget')
output = XOSProcessor.process(args)
fields = filter(lambda s:'Field(' in s, output.splitlines())
@@ -57,9 +55,8 @@
}
"""
- args = FakeArgs()
- args.inputs = xproto
- args.target = 'django.xtarget'
+ args = XOSProcessorArgs(inputs = xproto,
+ target = 'django.xtarget')
output = XOSProcessor.process(args)
null_true = filter(lambda s: 'null = True' in s, output.splitlines())
@@ -90,9 +87,8 @@
}
"""
- args = FakeArgs()
- args.inputs = xproto
- args.target = 'django.xtarget'
+ args = XOSProcessorArgs(inputs = xproto,
+ target = 'django.xtarget')
output = XOSProcessor.process(args)
self.assertIn("feedback_state_fields = ['parent_name', 'name']", output)
@@ -110,9 +106,8 @@
}
"""
- args = FakeArgs()
- args.inputs = xproto
- args.target = 'django.xtarget'
+ args = XOSProcessorArgs(inputs = xproto,
+ target = 'django.xtarget')
output = XOSProcessor.process(args)
self.assertIn("validators=[", output)