[#28] fixed mistake in test for getRelatedModelsByID

Author: Castronova

odm2api/ODM2/services/readService.py

@@ -939,7 +939,7 @@ def getSimulationByActionID(self, actionID):
 
     def getRelatedModelsByID(self, modelid):
         try:
-            return self._session.query(RelatedModels).filter_by(ModelID=modelid).all()
+            return self._session.query(RelatedModels).filter_by(RelatedModelID=modelid).all()
         except:
             return None
 

tests/test_odm2/data/populated.sql

@@ -15956,6 +15956,7 @@ CREATE TABLE RelatedModels (
 	FOREIGN KEY (ModelID) REFERENCES Models (ModelID)
 	ON UPDATE NO ACTION ON DELETE NO ACTION
 );
+INSERT INTO "RelatedModels" VALUES(1, 1, 'TestRelationship', 2);
 CREATE TABLE Simulations (
 	SimulationID INTEGER   NOT NULL PRIMARY KEY,
 	ActionID INTEGER   NOT NULL,

tests/test_odm2/test_readservice.py

@@ -133,25 +133,19 @@ def test_getModelByCode(self):
 
     def test_getRelatedModelsByID(self):
 
-        # get all models from the database
-        res = self.engine.execute('SELECT * FROM Models').fetchall()
-        m1 = rawSql2Alchemy(res[0], models.Models)
-        m2 = rawSql2Alchemy(res[1], models.Models)
-
-
-        # create a relationship between them
-        self.engine.execute('INSERT INTO RelatedModels Values(1, ?, "TestRelationship", ?)', (m1.ModelID), m2.ModelID)
+        # get related models by id using the api
+        resapi = self.reader.getRelatedModelsByID(2)
 
+        assert resapi is not None
+        assert resapi[0].ModelObj.ModelCode == 'swat'
 
+    def test_getRelatedModelsByCode(self):
 
         # get related models by id using the api
-        resapi = self.reader.getRelatedModelsByID(m1.ModelID)
+        resapi = self.reader.getRelatedModelsByCode('swmm')
 
         assert resapi is not None
-        assert resapi[0].RelatedModelObj.ModelCode == 'swmm'
-
-    def test_getRelatedModelsByCode(self):
-        pass
+        assert resapi[0].RelatedModelObj.ModelCode == 'swat'
 
 
 # ################################################################################