arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Update tests to match new UX

Browse Source
This commit is contained in:
FreneticScribbler
2020-02-27 10:06:50 +00:00
parent 09d1b42728
commit a707fe847e
3 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/management/commands/generateSampleAssetsData.py
View File

@@ -78,6 +78,9 @@ class Command(BaseCommand):
suppliers = models.Supplier.objects.all() suppliers = models.Supplier.objects.all()
connectors = models.Connector.objects.all() connectors = models.Connector.objects.all()
for i in range(len(connectors)):
models.CableType.objects.create(plug=random.choice(connectors), socket=random.choice(connectors), circuits=random.choice(circuits), cores=random.choice(cores))
for i in range(100): for i in range(100):
asset = models.Asset( asset = models.Asset(
asset_id='{}'.format(models.Asset.get_available_asset_id()), asset_id='{}'.format(models.Asset.get_available_asset_id()),
@@ -87,12 +90,9 @@ class Command(BaseCommand):
date_acquired=timezone.now().date(), date_acquired=timezone.now().date(),
is_cable=True, is_cable=True,
plug=random.choice(connectors), cable_type=random.choice(models.CableType.objects.all()),
socket=random.choice(connectors),
csa=random.choice(csas), csa=random.choice(csas),
length=random.choice(lengths), length=random.choice(lengths),
circuits=random.choice(circuits),
cores=random.choice(cores)
) )
if i % 5 == 0: if i % 5 == 0:

5
assets/tests/pages.py
View File

@@ -82,12 +82,9 @@ class AssetForm(FormPage):
'category': (regions.SingleSelectPicker, (By.ID, 'id_category')), 'category': (regions.SingleSelectPicker, (By.ID, 'id_category')),
'status': (regions.SingleSelectPicker, (By.ID, 'id_status')), 'status': (regions.SingleSelectPicker, (By.ID, 'id_status')),
'plug': (regions.SingleSelectPicker, (By.ID, 'id_plug')), 'cable_type': (regions.SingleSelectPicker, (By.ID, 'id_cable_type')),
'socket': (regions.SingleSelectPicker, (By.ID, 'id_socket')),
'length': (regions.TextBox, (By.ID, 'id_length')), 'length': (regions.TextBox, (By.ID, 'id_length')),
'csa': (regions.TextBox, (By.ID, 'id_csa')), 'csa': (regions.TextBox, (By.ID, 'id_csa')),
'circuits': (regions.TextBox, (By.ID, 'id_circuits')),
'cores': (regions.TextBox, (By.ID, 'id_cores'))
} }
@property @property

26
assets/tests/test_assets.py
View File

@@ -98,6 +98,7 @@ class TestAssetForm(AutoLoginTest):
self.supplier = models.Supplier.objects.create(name="Fullmetal Heavy Industry") self.supplier = models.Supplier.objects.create(name="Fullmetal Heavy Industry")
self.parent = models.Asset.objects.create(asset_id="9000", description="Shelf", status=self.status, category=self.category, date_acquired=datetime.date(2000, 1, 1)) self.parent = models.Asset.objects.create(asset_id="9000", description="Shelf", status=self.status, category=self.category, date_acquired=datetime.date(2000, 1, 1))
self.connector = models.Connector.objects.create(description="IEC", current_rating=10, voltage_rating=240, num_pins=3) self.connector = models.Connector.objects.create(description="IEC", current_rating=10, voltage_rating=240, num_pins=3)
self.cable_type = models.CableType.objects.create(plug=self.connector, socket=self.connector, circuits=1, cores=3)
self.page = pages.AssetCreate(self.driver, self.live_server_url).open() self.page = pages.AssetCreate(self.driver, self.live_server_url).open()
def test_asset_create(self): def test_asset_create(self):
@@ -154,12 +155,10 @@ class TestAssetForm(AutoLoginTest):
self.page.is_cable = True self.page.is_cable = True
self.assertTrue(self.driver.find_element_by_id('cable-table').is_displayed()) self.assertTrue(self.driver.find_element_by_id('cable-table').is_displayed())
self.page.plug = "IEC" self.page.cable_type = "IEC → IEC"
self.page.socket = "IEC" self.page.socket = "IEC"
self.page.length = 10 self.page.length = 10
self.page.csa = "1.5" self.page.csa = "1.5"
self.page.circuits = 1
self.page.cores = 3
self.page.submit() self.page.submit()
self.assertTrue(self.page.success) self.assertTrue(self.page.success)
@@ -375,7 +374,8 @@ class TestFormValidation(TestCase):
cls.status = models.AssetStatus.objects.create(name="Broken", should_show=True) cls.status = models.AssetStatus.objects.create(name="Broken", should_show=True)
cls.asset = models.Asset.objects.create(asset_id="9999", description="The Office", status=cls.status, category=cls.category, date_acquired=datetime.date(2018, 6, 15)) cls.asset = models.Asset.objects.create(asset_id="9999", description="The Office", status=cls.status, category=cls.category, date_acquired=datetime.date(2018, 6, 15))
cls.connector = models.Connector.objects.create(description="16A IEC", current_rating=16, voltage_rating=240, num_pins=3) cls.connector = models.Connector.objects.create(description="16A IEC", current_rating=16, voltage_rating=240, num_pins=3)
cls.cable_asset = models.Asset.objects.create(asset_id="666", description="125A -> Jack", comments="The cable from Hell...", status=cls.status, category=cls.category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, plug=cls.connector, socket=cls.connector, length=10, csa="1.5", circuits=1, cores=3) cls.cable_type = models.CableType.objects.create(circuits=11, cores=3, plug=cls.connector, socket=cls.connector)
cls.cable_asset = models.Asset.objects.create(asset_id="666", description="125A -> Jack", comments="The cable from Hell...", status=cls.status, category=cls.category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cls.cable_type, length=10, csa="1.5")
def setUp(self): def setUp(self):
self.profile.set_password('testuser') self.profile.set_password('testuser')
@@ -399,12 +399,9 @@ class TestFormValidation(TestCase):
response = self.client.post(url, {'asset_id': 'X$%A', 'is_cable': True}) response = self.client.post(url, {'asset_id': 'X$%A', 'is_cable': True})
self.assertFormError(response, 'form', 'asset_id', 'An Asset ID can only consist of letters and numbers, with a final number') self.assertFormError(response, 'form', 'asset_id', 'An Asset ID can only consist of letters and numbers, with a final number')
self.assertFormError(response, 'form', 'plug', 'A cable must have a plug') self.assertFormError(response, 'form', 'cable_type', 'A cable must have a type')
self.assertFormError(response, 'form', 'socket', 'A cable must have a socket')
self.assertFormError(response, 'form', 'length', 'The length of a cable must be more than 0') self.assertFormError(response, 'form', 'length', 'The length of a cable must be more than 0')
self.assertFormError(response, 'form', 'csa', 'The CSA of a cable must be more than 0') self.assertFormError(response, 'form', 'csa', 'The CSA of a cable must be more than 0')
self.assertFormError(response, 'form', 'circuits', 'There must be at least one circuit in a cable')
self.assertFormError(response, 'form', 'cores', 'There must be at least one core in a cable')
# Given that validation is done at model level it *shouldn't* need retesting...gonna do it anyway! # Given that validation is done at model level it *shouldn't* need retesting...gonna do it anyway!
def test_asset_edit(self): def test_asset_edit(self):
@@ -422,24 +419,19 @@ class TestFormValidation(TestCase):
def test_cable_edit(self): def test_cable_edit(self):
url = reverse('asset_update', kwargs={'pk': self.cable_asset.asset_id}) url = reverse('asset_update', kwargs={'pk': self.cable_asset.asset_id})
# TODO Why do I have to send is_cable=True here? # TODO Why do I have to send is_cable=True here?
response = self.client.post(url, {'is_cable': True, 'length': -3, 'csa': -3, 'circuits': -4, 'cores': -8}) response = self.client.post(url, {'is_cable': True, 'length': -3, 'csa': -3})
# Can't figure out how to select the 'none' option... # TODO Can't figure out how to select the 'none' option...
# self.assertFormError(response, 'form', 'plug', 'A cable must have a plug') # self.assertFormError(response, 'form', 'cable_type', 'A cable must have a type')
# self.assertFormError(response, 'form', 'socket', 'A cable must have a socket')
self.assertFormError(response, 'form', 'length', 'The length of a cable must be more than 0') self.assertFormError(response, 'form', 'length', 'The length of a cable must be more than 0')
self.assertFormError(response, 'form', 'csa', 'The CSA of a cable must be more than 0') self.assertFormError(response, 'form', 'csa', 'The CSA of a cable must be more than 0')
self.assertFormError(response, 'form', 'circuits', 'There must be at least one circuit in a cable')
self.assertFormError(response, 'form', 'cores', 'There must be at least one core in a cable')
def test_asset_duplicate(self): def test_asset_duplicate(self):
url = reverse('asset_duplicate', kwargs={'pk': self.cable_asset.asset_id}) url = reverse('asset_duplicate', kwargs={'pk': self.cable_asset.asset_id})
response = self.client.post(url, {'is_cable': True, 'length': 0, 'csa': 0, 'circuits': 0, 'cores': 0}) response = self.client.post(url, {'is_cable': True, 'length': 0, 'csa': 0})
self.assertFormError(response, 'form', 'length', 'The length of a cable must be more than 0') self.assertFormError(response, 'form', 'length', 'The length of a cable must be more than 0')
self.assertFormError(response, 'form', 'csa', 'The CSA of a cable must be more than 0') self.assertFormError(response, 'form', 'csa', 'The CSA of a cable must be more than 0')
self.assertFormError(response, 'form', 'circuits', 'There must be at least one circuit in a cable')
self.assertFormError(response, 'form', 'cores', 'There must be at least one core in a cable')
class TestSampleDataGenerator(TestCase): class TestSampleDataGenerator(TestCase):