Skip to content

Commit

Permalink
Refs #253, cleanup test.
Browse files Browse the repository at this point in the history
  • Loading branch information
doumdi committed Oct 7, 2024
1 parent f851261 commit a64e99a
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions teraserver/python/tests/opentera/db/models/test_TeraSite.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from tests.opentera.db.models.BaseModelsTest import BaseModelsTest
from sqlalchemy import exc
from opentera.db.models.TeraSite import TeraSite
from opentera.db.models.TeraProject import TeraProject
Expand All @@ -15,6 +14,17 @@
from opentera.db.models.TeraUserUserGroup import TeraUserUserGroup
from opentera.db.models.TeraServiceAccess import TeraServiceAccess

from tests.opentera.db.models.BaseModelsTest import BaseModelsTest
from tests.opentera.db.models.test_TeraDevice import TeraDeviceTest
from tests.opentera.db.models.test_TeraProject import TeraProjectTest
from tests.opentera.db.models.test_TeraParticipant import TeraParticipantTest
from tests.opentera.db.models.test_TeraSession import TeraSessionTest
from tests.opentera.db.models.test_TeraDeviceSite import TeraDeviceSiteTest
from tests.opentera.db.models.test_TeraServiceSite import TeraServiceSiteTest
from tests.opentera.db.models.test_TeraServiceRole import TeraServiceRoleTest
from tests.opentera.db.models.test_TeraSessionTypeSite import TeraSessionTypeSiteTest
from tests.opentera.db.models.test_TeraTestTypeSite import TeraTestTypeSiteTest

class TeraSiteTest(BaseModelsTest):

def test_nullable_args(self):
Expand Down Expand Up @@ -139,17 +149,14 @@ def test_hard_delete(self):
site = TeraSiteTest.new_test_site()
id_site = site.id_site

from tests.opentera.db.models.test_TeraProject import TeraProjectTest
project = TeraProjectTest.new_test_project(id_site=id_site)
self.assertIsNotNone(project.id_project)
id_project = project.id_project

from tests.opentera.db.models.test_TeraParticipant import TeraParticipantTest
participant = TeraParticipantTest.new_test_participant(id_project=id_project)
self.assertIsNotNone(participant.id_participant)
id_participant = participant.id_participant

from tests.opentera.db.models.test_TeraSession import TeraSessionTest
ses = TeraSessionTest.new_test_session(id_session_type=1, id_creator_participant=1,
participants=[participant])
id_session = ses.id_session
Expand Down Expand Up @@ -186,31 +193,25 @@ def test_undelete(self):
id_site = site.id_site

# Associate device
from tests.opentera.db.models.test_TeraDevice import TeraDeviceTest
device = TeraDeviceTest.new_test_device()
id_device = device.id_device

from tests.opentera.db.models.test_TeraDeviceSite import TeraDeviceSiteTest
device = TeraDeviceSiteTest.new_test_device_site(id_device=id_device, id_site=id_site)
id_device_site = device.id_device_site

# ... and service
from tests.opentera.db.models.test_TeraServiceSite import TeraServiceSiteTest
service_site = TeraServiceSiteTest.new_test_service_site(id_site=id_site, id_service=3)
id_service_site = service_site.id_service_site

# ... and roles
from tests.opentera.db.models.test_TeraServiceRole import TeraServiceRoleTest
role = TeraServiceRoleTest.new_test_service_role(id_service=3, id_site=id_site, role_name='Test')
id_role = role.id_service_role

# ... and session type
from tests.opentera.db.models.test_TeraSessionTypeSite import TeraSessionTypeSiteTest
ses_type = TeraSessionTypeSiteTest.new_test_session_type_site(id_site=id_site, id_session_type=1)
id_session_type = ses_type.id_session_type_site

# ... and test type
from tests.opentera.db.models.test_TeraTestTypeSite import TeraTestTypeSiteTest
test_type = TeraTestTypeSiteTest.new_test_test_type_site(id_site=id_site, id_test_type=1)
id_test_type = test_type.id_test_type_site

Expand Down Expand Up @@ -264,11 +265,6 @@ def test_enable_2fa_in_site_should_enable_in_users(self):
# User should be updated automatically with 2fa
self.assertTrue(user.user_2fa_enabled)






@staticmethod
def new_test_site(name: str = 'Test Site', site_2fa_required: bool = False) -> TeraSite:
site = TeraSite()
Expand Down

0 comments on commit a64e99a

Please sign in to comment.