Replace deprecated unittest.makeSuite()

The function has been deprecated in Python 3.11 and will be removed from
the upcoming Python 3.13.

See: https://docs.python.org/3.13/whatsnew/3.13.html#unittest

src/bindings/python/test.py

@@ -43,6 +43,7 @@
 
 def suite():
   suite = unittest.TestSuite()
+  loader = unittest.TestLoader()
   cwd = os.getcwd()    
   sys.path.append(cwd)
   os.chdir(test_basedir + '/..')
@@ -52,7 +53,7 @@ def suite():
       module_name = re.compile(r"\.py$").sub('',os.path.basename(file))     
       module = __import__(module_name)
       class_name = getattr(module, module_name)
-      suite.addTest(unittest.makeSuite(class_name))
+      suite.addTest(loader.loadTestsFromTestCase(class_name))
   return suite
 
 if __name__ == "__main__":

src/bindings/python/test/annotation/TestAnnotationCopyAndClone.py

@@ -223,7 +223,7 @@ def test_ModelHistory_copyConstructor(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestAnnotationCopyAndClone))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestAnnotationCopyAndClone))
 
   return suite
 

src/bindings/python/test/annotation/TestCVTerms.py

@@ -124,7 +124,7 @@ def test_CVTerm_set_get(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCVTerms))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCVTerms))
 
   return suite
 

src/bindings/python/test/annotation/TestCVTerms_newSetters.py

@@ -124,7 +124,7 @@ def test_CVTerm_setModelQualifierType(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCVTerms_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCVTerms_newSetters))
 
   return suite
 

src/bindings/python/test/annotation/TestDate_newSetters.py

@@ -190,7 +190,7 @@ def test_Date_setYear(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestDate_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestDate_newSetters))
 
   return suite
 

src/bindings/python/test/annotation/TestL3ModelHistory.py

@@ -341,7 +341,7 @@ def test_L3ModelHistory_parseModelHistory_Model(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestL3ModelHistory))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestL3ModelHistory))
 
   return suite
 

src/bindings/python/test/annotation/TestModelCreator_newSetters.py

@@ -111,7 +111,7 @@ def test_ModelCreator_setOrganization(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestModelCreator_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestModelCreator_newSetters))
 
   return suite
 

src/bindings/python/test/annotation/TestModelHistory.py

@@ -280,7 +280,7 @@ def test_ModelHistory_setModifiedDate(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestModelHistory))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestModelHistory))
 
   return suite
 

src/bindings/python/test/annotation/TestModelHistory_newSetters.py

@@ -127,7 +127,7 @@ def test_ModelHistory_setModifiedDate2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestModelHistory_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestModelHistory_newSetters))
 
   return suite
 

src/bindings/python/test/annotation/TestRDFAnnotation.py

@@ -746,7 +746,7 @@ def test_RDFAnnotation_testMissingMetaId(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestRDFAnnotation))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestRDFAnnotation))
 
   return suite
 

src/bindings/python/test/annotation/TestRDFAnnotation2.py

@@ -239,7 +239,7 @@ def test_RDFAnnotation2_modelWithHistoryWithCharacterReference(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestRDFAnnotation2))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestRDFAnnotation2))
 
   return suite
 

src/bindings/python/test/annotation/TestRDFAnnotationC.py

@@ -221,7 +221,7 @@ def test_RDFAnnotation_C_parseModelHistory(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestRDFAnnotationC))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestRDFAnnotationC))
 
   return suite
 

src/bindings/python/test/annotation/TestValidation.py

@@ -156,7 +156,7 @@ def test_Validation_ModelHistory3(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestValidation))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestValidation))
 
   return suite
 

src/bindings/python/test/math/TestASTNode.py

@@ -1158,7 +1158,7 @@ def test_ASTNode_units(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestASTNode))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestASTNode))
 
   return suite
 

src/bindings/python/test/math/TestL3FormulaParserC.py

@@ -1268,7 +1268,7 @@ def test_SBML_C_parseL3Formula_unitssettings(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestL3FormulaParserC))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestL3FormulaParserC))
 
   return suite
 

src/bindings/python/test/math/TestMathReadFromFile1.py

@@ -96,7 +96,7 @@ def test_read_MathML_1(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestMathReadFromFile1))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestMathReadFromFile1))
 
   return suite
 

src/bindings/python/test/math/TestMathReadFromFile2.py

@@ -120,7 +120,7 @@ def test_read_MathML_2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestMathReadFromFile2))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestMathReadFromFile2))
 
   return suite
 

src/bindings/python/test/math/TestReadMathML.py

@@ -935,7 +935,7 @@ def test_element_xor(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestReadMathML))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestReadMathML))
 
   return suite
 

src/bindings/python/test/math/TestValidASTNode.py

@@ -239,7 +239,7 @@ def test_ValidASTNode_unary(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestValidASTNode))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestValidASTNode))
 
   return suite
 

src/bindings/python/test/math/TestWriteMathML.py

@@ -568,7 +568,7 @@ def test_MathMLFormatter_sin(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestWriteMathML))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestWriteMathML))
 
   return suite
 

src/bindings/python/test/sbml/TestAlgebraicRule.py

@@ -106,7 +106,7 @@ def test_AlgebraicRule_free_NULL(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestAlgebraicRule))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestAlgebraicRule))
 
   return suite
 

src/bindings/python/test/sbml/TestAncestor.py

@@ -887,7 +887,7 @@ def test_Unit_ancestor_create_model(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestAncestor))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestAncestor))
 
   return suite
 

src/bindings/python/test/sbml/TestAssignmentRule.py

@@ -127,7 +127,7 @@ def test_AssignmentRule_setVariable(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestAssignmentRule))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestAssignmentRule))
 
   return suite
 

src/bindings/python/test/sbml/TestCompartment.py

@@ -226,7 +226,7 @@ def test_Compartment_unsetVolume(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCompartment))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCompartment))
 
   return suite
 

src/bindings/python/test/sbml/TestCompartmentType.py

@@ -121,7 +121,7 @@ def test_CompartmentType_unsetName(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCompartmentType))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCompartmentType))
 
   return suite
 

src/bindings/python/test/sbml/TestCompartmentType_newSetters.py

@@ -94,7 +94,7 @@ def test_CompartmentType_setName3(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCompartmentType_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCompartmentType_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestCompartmentVolumeRule.py

@@ -83,7 +83,7 @@ def test_CompartmentVolumeRule_setCompartment(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCompartmentVolumeRule))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCompartmentVolumeRule))
 
   return suite
 

src/bindings/python/test/sbml/TestCompartment_newSetters.py

@@ -285,7 +285,7 @@ def test_Compartment_setVolume2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCompartment_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCompartment_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestConsistencyChecks.py

@@ -80,7 +80,7 @@ def test_consistency_checks(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestConsistencyChecks))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestConsistencyChecks))
 
   return suite
 

src/bindings/python/test/sbml/TestConstraint.py

@@ -120,7 +120,7 @@ def test_Constraint_setMessage(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestConstraint))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestConstraint))
 
   return suite
 

src/bindings/python/test/sbml/TestConstraint_newSetters.py

@@ -108,7 +108,7 @@ def test_Constraint_setMessage2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestConstraint_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestConstraint_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestCopyAndClone.py

@@ -925,7 +925,7 @@ def test_Unit_copyConstructor(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestCopyAndClone))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestCopyAndClone))
 
   return suite
 

src/bindings/python/test/sbml/TestDelay.py

@@ -123,7 +123,7 @@ def test_Delay_setMath2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestDelay))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestDelay))
 
   return suite
 

src/bindings/python/test/sbml/TestEvent.py

@@ -214,7 +214,7 @@ def test_Event_setUseValuesFromTriggerTime(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestEvent))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestEvent))
 
   return suite
 

src/bindings/python/test/sbml/TestEventAssignment.py

@@ -120,7 +120,7 @@ def test_EventAssignment_setVariable(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestEventAssignment))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestEventAssignment))
 
   return suite
 

src/bindings/python/test/sbml/TestEventAssignment_newSetters.py

@@ -90,7 +90,7 @@ def test_EventAssignment_setVariable2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestEventAssignment_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestEventAssignment_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestEvent_newSetters.py

@@ -262,7 +262,7 @@ def test_Event_setUseValuesFromTriggerTime2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestEvent_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestEvent_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestFunctionDefinition.py

@@ -186,7 +186,7 @@ def test_FunctionDefinition_setName(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestFunctionDefinition))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestFunctionDefinition))
 
   return suite
 

src/bindings/python/test/sbml/TestFunctionDefinition_newSetters.py

@@ -114,7 +114,7 @@ def test_FunctionDefinition_setName3(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestFunctionDefinition_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestFunctionDefinition_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestGetMultipleObjects.py

@@ -282,7 +282,7 @@ def test_GetMultipleObjects_noUnits(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestGetMultipleObjects))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestGetMultipleObjects))
 
   return suite
 

src/bindings/python/test/sbml/TestInitialAssignment.py

@@ -120,7 +120,7 @@ def test_InitialAssignment_setSymbol(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestInitialAssignment))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestInitialAssignment))
 
   return suite
 

src/bindings/python/test/sbml/TestInitialAssignment_newSetters.py

@@ -90,7 +90,7 @@ def test_InitialAssignment_setSymbol2(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestInitialAssignment_newSetters))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestInitialAssignment_newSetters))
 
   return suite
 

src/bindings/python/test/sbml/TestInternalConsistencyChecks.py

@@ -1621,7 +1621,7 @@ def test_internal_consistency_check_99925(self):
 
 def suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestInternalConsistencyChecks))
+  suite.addTest(unittest.TestLoader.loadTestsFromTestCase(TestInternalConsistencyChecks))
 
   return suite