fixing tests issues caused by new fields addition in SP table

Alexis Koralewski
1 parent 077d5a23
Showing 3 changed files with 27 additions and 7 deletions Show diff stats
src/core/pyros_django/common/tests.py
src/core/pyros_django/misc/fixtures/tests/common_test.json
src/core/pyros_django/user_manager/tests.py
@@ -23,8 +23,7 @@ class RequestBuilderTests(TestCase):
         # (AKo) We need to assign UserLevel after PyrosUser creation, we can't associate directly from creation because it's a m2m relation
         UserLevel.objects.all()[0].pyros_users.add(self.pyusr)
         #self.sp = ScientificProgram.objects.create(name="default",institute=institute,sp_pi=self.pyusr,science_theme=ScienceTheme.objects.all().first())
-        self.sp = ScientificProgram.objects.create(name="default",institute=institute,sp_pi=self.pyusr)
-
+        self.sp = ScientificProgram.objects.create(name="default",institute=institute,sp_pi=self.pyusr,science_theme=ScienceTheme.objects.all().first())
     def test_full_creation(self):
         '''
             Goal : Create a full request with sequences, albums & plans, and check if they are in the DB
@@ -103,7 +102,7 @@ class RequestTests(TestCase):
         admin.pyros_users.add(haribo)
         science_theme = ScienceTheme.objects.create(name="Solar System")
         #sp1 = ScientificProgram.objects.create(name="sp1",institute=institute,sp_pi=haribo,science_theme=science_theme)
-        sp1 = ScientificProgram.objects.create(name="sp1",institute=institute,sp_pi=haribo)
+        sp1 = ScientificProgram.objects.create(name="sp1",institute=institute,sp_pi=haribo,science_theme=ScienceTheme.objects.all().first())
         req1 = Request.objects.create(
             name="req1", pyros_user=haribo, scientific_program=sp1)
         alert = Alert(strategyobs=strat1, request_id=req1)
@@ -155,6 +155,27 @@
     }
 },
 {
+    "model":"common.ScienceTheme",
+    "pk":1,
+    "fields":{
+        "name":"Solar System"
+    }
+},
+{
+    "model":"common.ScienceTheme",
+    "pk":2,
+    "fields":{
+        "name":"Galatic"
+    }
+},
+{
+    "model":"common.ScienceTheme",
+    "pk":3,
+    "fields":{
+        "name":"Extra Galatic"
+    }
+},
+{
     "model": "common.scientificprogram",
     "pk": 1,
     "fields": {
@@ -30,10 +30,10 @@ class UserManagerTests(TestCase):
         #sp2 = ScientificProgram.objects.create(name="sp2",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
         #sp3 = ScientificProgram.objects.create(name="sp3",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
         #sp4 = ScientificProgram.objects.create(name="sp4",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
-        sp1 = ScientificProgram.objects.create(name="sp1",institute=institute,sp_pi=PyrosUser.objects.all().first())
-        sp2 = ScientificProgram.objects.create(name="sp2",institute=institute,sp_pi=PyrosUser.objects.all().first())
-        sp3 = ScientificProgram.objects.create(name="sp3",institute=institute,sp_pi=PyrosUser.objects.all().first())
-        sp4 = ScientificProgram.objects.create(name="sp4",institute=institute,sp_pi=PyrosUser.objects.all().first())
+        sp1 = ScientificProgram.objects.create(name="sp1",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
+        sp2 = ScientificProgram.objects.create(name="sp2",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
+        sp3 = ScientificProgram.objects.create(name="sp3",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
+        sp4 = ScientificProgram.objects.create(name="sp4",institute=institute,sp_pi=PyrosUser.objects.all().first(),science_theme=science_theme)
         SP_Period.objects.create(scientific_program=sp1,period=period)
         SP_Period.objects.create(scientific_program=sp2,period=period)
         SP_Period.objects.create(scientific_program=sp3,period=period)