From 23bcad4a5034e0002e8c3d1d27d9169ccc5b28c0 Mon Sep 17 00:00:00 2001
From: Garrett Barter <garrett.barter@nrel.gov>
Date: Wed, 1 May 2024 10:26:05 -0600
Subject: [PATCH] will probably accept changes

---
 .github/workflows/CI_pyFrame3DD.yml |  2 +-
 test/test_beam_theory.py            | 10 +---------
 test/test_breakdown.py              | 13 ++-----------
 test/test_frame.py                  | 23 +++++++++++++++--------
 4 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/CI_pyFrame3DD.yml b/.github/workflows/CI_pyFrame3DD.yml
index 0244118..fde0f2b 100644
--- a/.github/workflows/CI_pyFrame3DD.yml
+++ b/.github/workflows/CI_pyFrame3DD.yml
@@ -50,7 +50,7 @@ jobs:
                   python-version: ${{ matrix.python-version }}
                   update-environment: true
 
-            - name: Editable Pip Install pyFrame3DD (windows)
+            - name: Editable Pip Install pyFrame3DD
               run: |
                   '${{ steps.cp.outputs.python-path }}' -m pip install --upgrade pip
                   '${{ steps.cp.outputs.python-path }}' -m pip install meson-python meson numpy ninja wheel
diff --git a/test/test_beam_theory.py b/test/test_beam_theory.py
index bd3a085..762b827 100644
--- a/test/test_beam_theory.py
+++ b/test/test_beam_theory.py
@@ -107,13 +107,5 @@ def testFixedFree_FreeFree(self):
         self.assertAlmostEqual(freq[5], anal[2], -2)
     
 
-
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(FrameTestEXA))
-    return suite
-
 if __name__ == '__main__':
-    unittest.TextTestRunner().run(suite())
+    unittest.main()
diff --git a/test/test_breakdown.py b/test/test_breakdown.py
index a5dfa81..710ec55 100644
--- a/test/test_breakdown.py
+++ b/test/test_breakdown.py
@@ -213,19 +213,10 @@ def testModal(self):
         npt.assert_almost_equal(rxns_mass.Mxx, rxns_force.Mxx)
         npt.assert_almost_equal(rxns_mass.Myy, rxns_force.Myy)
         npt.assert_almost_equal(rxns_mass.Mzz, rxns_force.Mzz)
-        
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestBreakdown))
-    return suite
 
 
-if __name__ == "__main__":
-    result = unittest.TextTestRunner().run(suite())
 
-    if result.wasSuccessful():
-        exit(0)
-    else:
-        exit(1)
+if __name__ == "__main__":
+    unittest.main()
     
 
diff --git a/test/test_frame.py b/test/test_frame.py
index 83e6bf4..f3d71c8 100644
--- a/test/test_frame.py
+++ b/test/test_frame.py
@@ -917,11 +917,18 @@ def test_addgrav_working(self):
 
 
 def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(FrameTestEXA))
-    suite.addTest(unittest.makeSuite(FrameTestEXB))
-    suite.addTest(unittest.makeSuite(GravityAdd))
-    return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner().run(suite())
+    suite = [
+        unittest.TestLoader().loadTestsFromTestCase(FrameTestEXA),
+        unittest.TestLoader().loadTestsFromTestCase(FrameTestEXB),
+        unittest.TestLoader().loadTestsFromTestCase(GravityAdd),
+    ]
+    return unittest.TestSuite(suite)
+
+if __name__ == "__main__":
+    result = unittest.TextTestRunner().run(suite())
+
+    if result.wasSuccessful():
+        exit(0)
+    else:
+        exit(1)
+