Merge pull request sandialabs#93 from sandialabs/move-to-old-test-str…

…ucture Brandon's testing preference.
btalamini · Oct 18, 2024 · 4122fa2 · 4122fa2
2 parents 87d421b + 5fa05da
commit 4122fa2
Show file tree

Hide file tree

Showing 78 changed files with 37 additions and 30 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+omit = optimism/test/*
+       optimism/contact/test/*
+       optimism/inverse/test/*
+       optimism/material/test/*
+       optimism/phasefield/test/*
+       optimism/treigen/test/*
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -34,7 +34,7 @@ jobs:
       - name: pytest
         run: |
           pip install -e ".[sparse,test]"
-          python -m pytest -n auto test --cov=optimism -Wignore
+          python -m pytest -n auto optimism --cov=optimism -Wignore
           # we can also add the flag -n auto for parallel testing
       - name: codecov
         uses: codecov/codecov-action@v4

diff --git a/test/.gitignore → optimism/contact/test/.gitignore b/test/.gitignore → optimism/contact/test/.gitignore
diff --git a/test/__init__.py → optimism/contact/test/__init__.py b/test/__init__.py → optimism/contact/test/__init__.py
diff --git a/test/contact/test_Contact.py → optimism/contact/test/test_Contact.py b/test/contact/test_Contact.py → optimism/contact/test/test_Contact.py
@@ -1,6 +1,6 @@
 import unittest
 from optimism.JaxConfig import *
-from ..MeshFixture import MeshFixture
+from optimism.test.MeshFixture import MeshFixture
 from optimism.contact import Contact
 from optimism.contact import Friction
 from optimism import Mesh

diff --git a/test/contact/test_Cpp.py → optimism/contact/test/test_Cpp.py b/test/contact/test_Cpp.py → optimism/contact/test/test_Cpp.py
@@ -5,7 +5,7 @@
 
 from optimism.contact import EdgeCpp
 from optimism import SmoothFunctions
-from ..TestFixture import TestFixture
+from optimism.test.TestFixture import TestFixture
 
 doPlotting=False
 

diff --git a/test/contact/test_EdgeIntersection.py → ...ism/contact/test/test_EdgeIntersection.py b/test/contact/test_EdgeIntersection.py → ...ism/contact/test/test_EdgeIntersection.py
@@ -3,7 +3,7 @@
 
 from optimism.JaxConfig import *
 from optimism.contact import EdgeIntersection
-from ..TestFixture import TestFixture
+from optimism.test.TestFixture import TestFixture
 
 
 class TestEdgeIntersection(TestFixture):

diff --git a/test/contact/test_LevelsetConstraint.py → ...m/contact/test/test_LevelsetConstraint.py b/test/contact/test_LevelsetConstraint.py → ...m/contact/test/test_LevelsetConstraint.py
@@ -9,7 +9,7 @@
 from optimism.contact import Friction
 from optimism.contact import Levelset
 from optimism.contact import LevelsetConstraint
-from ..MeshFixture import MeshFixture, defaultProps
+from optimism.test.MeshFixture import MeshFixture, defaultProps
 from optimism import Mechanics
 from optimism import FunctionSpace
 from optimism import QuadratureRule

diff --git a/test/contact/test_MortarGeom.py → optimism/contact/test/test_MortarGeom.py b/test/contact/test_MortarGeom.py → optimism/contact/test/test_MortarGeom.py
@@ -1,4 +1,4 @@
-from ..TestFixture import *
+from optimism.test.TestFixture import *
 from optimism import QuadratureRule
 from optimism.contact import MortarContact
 import jax

diff --git a/test/contact/test_NewtonGlobalization.py → .../contact/test/test_NewtonGlobalization.py b/test/contact/test_NewtonGlobalization.py → .../contact/test/test_NewtonGlobalization.py
@@ -1,7 +1,7 @@
 from numpy.random import rand
 
 from optimism.JaxConfig import *
-from ..TestFixture import *
+from optimism.test.TestFixture import *
 from optimism.NewtonSolver import *
 from optimism import AlSolver
 from optimism.Objective import Objective

diff --git a/test/contact/test_Search.py → optimism/contact/test/test_Search.py b/test/contact/test_Search.py → optimism/contact/test/test_Search.py
@@ -5,7 +5,7 @@
 from optimism import QuadratureRule
 from optimism.contact import Search
 from optimism.contact import EdgeIntersection
-from ..MeshFixture import MeshFixture
+from optimism.test.MeshFixture import MeshFixture
 
 
 def get_best_overlap_vector(mesh, edge, listOfEdges):

diff --git a/test/contact/test_TwoBodyContact.py → optimism/contact/test/test_TwoBodyContact.py b/test/contact/test_TwoBodyContact.py → optimism/contact/test/test_TwoBodyContact.py
@@ -5,7 +5,7 @@
 from optimism import Surface
 from optimism.contact import EdgeIntersection
 from optimism import FunctionSpace
-from ..MeshFixture import MeshFixture
+from optimism.test.MeshFixture import MeshFixture
 from optimism.contact import Contact
 from matplotlib import pyplot as plt
 

diff --git a/test/contact/test_TwoBodyMortarContact.py → ...contact/test/test_TwoBodyMortarContact.py b/test/contact/test_TwoBodyMortarContact.py → ...contact/test/test_TwoBodyMortarContact.py
@@ -1,6 +1,6 @@
 from optimism.JaxConfig import *
 from optimism import Mesh
-from ..MeshFixture import MeshFixture
+from optimism.test.MeshFixture import MeshFixture
 from optimism.contact import MortarContact
 import unittest
 

diff --git a/test/inverse/FiniteDifferenceFixture.py → ...m/inverse/test/FiniteDifferenceFixture.py b/test/inverse/FiniteDifferenceFixture.py → ...m/inverse/test/FiniteDifferenceFixture.py
@@ -1,4 +1,4 @@
-from ..MeshFixture import MeshFixture
+from optimism.test.MeshFixture import MeshFixture
 from collections import namedtuple
 import numpy as onp
 

diff --git a/test/contact/__init__.py → optimism/inverse/test/__init__.py b/test/contact/__init__.py → optimism/inverse/test/__init__.py
diff --git a/...erse/test_Hyperelastic_gradient_checks.py → ...test/test_Hyperelastic_gradient_checks.py b/...erse/test_Hyperelastic_gradient_checks.py → ...test/test_Hyperelastic_gradient_checks.py
diff --git a/...inverse/test_J2Plastic_gradient_checks.py → ...se/test/test_J2Plastic_gradient_checks.py b/...inverse/test_J2Plastic_gradient_checks.py → ...se/test/test_J2Plastic_gradient_checks.py
diff --git a/test/inverse/test_J2Plastic_inverse.py → ...sm/inverse/test/test_J2Plastic_inverse.py b/test/inverse/test_J2Plastic_inverse.py → ...sm/inverse/test/test_J2Plastic_inverse.py
@@ -12,8 +12,8 @@
 from optimism import QuadratureRule
 from optimism import TensorMath
 
-from ..TestFixture import TestFixture
-from ..MeshFixture import MeshFixture
+from optimism.test.TestFixture import TestFixture
+from optimism.test.MeshFixture import MeshFixture
 
 from optimism.inverse import MechanicsInverse
 

diff --git a/test/inverse/__init__.py → optimism/material/test/__init__.py b/test/inverse/__init__.py → optimism/material/test/__init__.py
diff --git a/test/material/plotJ2Plastic.py → optimism/material/test/plotJ2Plastic.py b/test/material/plotJ2Plastic.py → optimism/material/test/plotJ2Plastic.py
diff --git a/test/material/test_Gent.py → optimism/material/test/test_Gent.py b/test/material/test_Gent.py → optimism/material/test/test_Gent.py
@@ -6,7 +6,7 @@
 import jax.numpy as np
 
 from optimism.material import Gent
-from .. import TestFixture
+from optimism.test import TestFixture
 
 
 class TestGentMaterial(TestFixture.TestFixture):

diff --git a/test/material/test_Hardening.py → optimism/material/test/test_Hardening.py b/test/material/test_Hardening.py → optimism/material/test/test_Hardening.py
@@ -3,7 +3,7 @@
 from optimism.JaxConfig import *
 from optimism.material import J2Plastic
 from optimism.material import Hardening
-from ..TestFixture import TestFixture
+from optimism.test.TestFixture import TestFixture
 
 
 E = 100.0

diff --git a/test/material/test_HyperVisco.py → optimism/material/test/test_HyperVisco.py b/test/material/test_HyperVisco.py → optimism/material/test/test_HyperVisco.py
@@ -6,7 +6,7 @@
 from matplotlib import pyplot as plt
 
 from optimism.material import HyperViscoelastic as HyperVisco
-from ..TestFixture import TestFixture
+from optimism.test.TestFixture import TestFixture
 from optimism.material import MaterialUniaxialSimulator
 from optimism.TensorMath import deviator
 from optimism.TensorMath import log_symm

diff --git a/test/material/test_J2Plastic.py → optimism/material/test/test_J2Plastic.py b/test/material/test_J2Plastic.py → optimism/material/test/test_J2Plastic.py
@@ -13,8 +13,8 @@
 from optimism import Mesh
 from optimism import Objective
 from optimism import QuadratureRule
-from ..TestFixture import TestFixture
-from ..MeshFixture import MeshFixture
+from optimism.test.TestFixture import TestFixture
+from optimism.test.MeshFixture import MeshFixture
 
 
 plotting=False

diff --git a/test/material/test_LinearElastic.py → optimism/material/test/test_LinearElastic.py b/test/material/test_LinearElastic.py → optimism/material/test/test_LinearElastic.py
@@ -5,7 +5,7 @@
 import jax.numpy as np
 
 from optimism.material import LinearElastic
-from .. import TestFixture
+from optimism.test import TestFixture
 
 class TestLinearElasticMaterial(TestFixture.TestFixture):
     def setUp(self):

diff --git a/...aterial/test_MaterialUniaxialSimulator.py → ...al/test/test_MaterialUniaxialSimulator.py b/...aterial/test_MaterialUniaxialSimulator.py → ...al/test/test_MaterialUniaxialSimulator.py
@@ -4,7 +4,7 @@
 
 from optimism.material import MaterialUniaxialSimulator
 from optimism.material import LinearElastic
-from ..TestFixture import TestFixture
+from optimism.test.TestFixture import TestFixture
 
 
 class MaterialUniaxialSimulatorFixture(TestFixture):

diff --git a/test/material/test_RateSensitivity.py → ...ism/material/test/test_RateSensitivity.py b/test/material/test_RateSensitivity.py → ...ism/material/test/test_RateSensitivity.py
@@ -3,7 +3,7 @@
 import jax
 
 from optimism.material import Hardening
-from ..TestFixture import TestFixture
+from optimism.test.TestFixture import TestFixture
 
 class RateSensitivityFixture(TestFixture):
     def test_power_law_scales_correctly(self):

diff --git a/test/phasefield/.gitignore → optimism/phasefield/test/.gitignore b/test/phasefield/.gitignore → optimism/phasefield/test/.gitignore
diff --git a/test/material/__init__.py → optimism/phasefield/test/__init__.py b/test/material/__init__.py → optimism/phasefield/test/__init__.py
diff --git a/...hasefield/plotPhaseFieldThresholdModel.py → ...ield/test/plotPhaseFieldThresholdModel.py b/...hasefield/plotPhaseFieldThresholdModel.py → ...ield/test/plotPhaseFieldThresholdModel.py
diff --git a/test/phasefield/plotSandiaModelUniaxial.py → ...hasefield/test/plotSandiaModelUniaxial.py b/test/phasefield/plotSandiaModelUniaxial.py → ...hasefield/test/plotSandiaModelUniaxial.py
diff --git a/...asefield/test_PhaseFieldLorentzPlastic.py → ...eld/test/test_PhaseFieldLorentzPlastic.py b/...asefield/test_PhaseFieldLorentzPlastic.py → ...eld/test/test_PhaseFieldLorentzPlastic.py
@@ -6,8 +6,8 @@
 from optimism.JaxConfig import *
 from optimism import EquationSolver as EqSolver
 from optimism import Objective
-from .. import TestFixture
-from ..MeshFixture import MeshFixture
+from optimism.test import TestFixture
+from optimism.test.MeshFixture import MeshFixture
 from optimism.phasefield import PhaseFieldLorentzPlastic as Model
 from optimism import SparseMatrixAssembler
 from optimism import TensorMath

diff --git a/...eld/test_PhaseFieldLorentzPlasticPatch.py → ...est/test_PhaseFieldLorentzPlasticPatch.py b/...eld/test_PhaseFieldLorentzPlasticPatch.py → ...est/test_PhaseFieldLorentzPlasticPatch.py
@@ -5,7 +5,7 @@
 from optimism.phasefield import PhaseFieldLorentzPlastic as material
 from optimism.phasefield import PhaseField
 from optimism.phasefield import MaterialPointSimulator
-from .. import MeshFixture
+from optimism.test import MeshFixture
 from optimism import Mesh
 from optimism import AlSolver
 from optimism import EquationSolver as EqSolver

diff --git a/test/phasefield/test_PhaseFieldThreshold.py → ...asefield/test/test_PhaseFieldThreshold.py b/test/phasefield/test_PhaseFieldThreshold.py → ...asefield/test/test_PhaseFieldThreshold.py
@@ -5,8 +5,8 @@
 from optimism.JaxConfig import *
 from optimism import EquationSolver as EqSolver
 from optimism import Objective
-from .. import TestFixture
-from ..MeshFixture import MeshFixture
+from optimism.test import TestFixture
+from optimism.test.MeshFixture import MeshFixture
 from optimism.phasefield import PhaseFieldThreshold as Model
 from optimism import SparseMatrixAssembler
 from optimism import TensorMath

diff --git a/...asefield/test_PhaseFieldThresholdPatch.py → ...eld/test/test_PhaseFieldThresholdPatch.py b/...asefield/test_PhaseFieldThresholdPatch.py → ...eld/test/test_PhaseFieldThresholdPatch.py
@@ -5,7 +5,7 @@
 from optimism.phasefield import PhaseFieldThreshold as material
 from optimism.phasefield import PhaseField
 from optimism.phasefield import MaterialPointSimulator
-from .. import MeshFixture
+from optimism.test import MeshFixture
 from optimism import Mesh
 from optimism import AlSolver
 from optimism import EquationSolver as EqSolver

diff --git a/...efield/test_PhaseFieldThresholdPlastic.py → ...d/test/test_PhaseFieldThresholdPlastic.py b/...efield/test_PhaseFieldThresholdPlastic.py → ...d/test/test_PhaseFieldThresholdPlastic.py
@@ -6,8 +6,8 @@
 from optimism.JaxConfig import *
 from optimism import EquationSolver as EqSolver
 from optimism import Objective
-from ..TestFixture import TestFixture
-from ..MeshFixture import MeshFixture
+from optimism.test.TestFixture import TestFixture
+from optimism.test.MeshFixture import MeshFixture
 from optimism.phasefield import PhaseFieldThresholdPlastic as Model
 from optimism import SparseMatrixAssembler
 from optimism import TensorMath

diff --git a/test/phasefield/test_PhaseFieldUniaxial.py → ...hasefield/test/test_PhaseFieldUniaxial.py b/test/phasefield/test_PhaseFieldUniaxial.py → ...hasefield/test/test_PhaseFieldUniaxial.py
diff --git a/test/contact/.gitignore → optimism/test/.gitignore b/test/contact/.gitignore → optimism/test/.gitignore
diff --git a/test/ConvexityPlot.py → optimism/test/ConvexityPlot.py b/test/ConvexityPlot.py → optimism/test/ConvexityPlot.py
diff --git a/test/MeshFixture.py → optimism/test/MeshFixture.py b/test/MeshFixture.py → optimism/test/MeshFixture.py
diff --git a/test/TestFixture.py → optimism/test/TestFixture.py b/test/TestFixture.py → optimism/test/TestFixture.py
diff --git a/test/phasefield/__init__.py → optimism/test/__init__.py b/test/phasefield/__init__.py → optimism/test/__init__.py
diff --git a/test/ill_conditioned_dot_product_data.npz → ...test/ill_conditioned_dot_product_data.npz b/test/ill_conditioned_dot_product_data.npz → ...test/ill_conditioned_dot_product_data.npz
diff --git a/test/ill_conditioned_sum_data.npz → optimism/test/ill_conditioned_sum_data.npz b/test/ill_conditioned_sum_data.npz → optimism/test/ill_conditioned_sum_data.npz
diff --git a/test/patch.json → optimism/test/patch.json b/test/patch.json → optimism/test/patch.json
diff --git a/test/patch_2_blocks.g → optimism/test/patch_2_blocks.g b/test/patch_2_blocks.g → optimism/test/patch_2_blocks.g
diff --git a/test/read_material_property_test.exo → ...mism/test/read_material_property_test.exo b/test/read_material_property_test.exo → ...mism/test/read_material_property_test.exo
diff --git a/test/test_AxisymmPatchTest.py → optimism/test/test_AxisymmPatchTest.py b/test/test_AxisymmPatchTest.py → optimism/test/test_AxisymmPatchTest.py
diff --git a/test/test_DofManager.py → optimism/test/test_DofManager.py b/test/test_DofManager.py → optimism/test/test_DofManager.py
diff --git a/test/test_EquationSolver.py → optimism/test/test_EquationSolver.py b/test/test_EquationSolver.py → optimism/test/test_EquationSolver.py
diff --git a/test/test_FunctionSpace.py → optimism/test/test_FunctionSpace.py b/test/test_FunctionSpace.py → optimism/test/test_FunctionSpace.py
diff --git a/test/test_Interpolants.py → optimism/test/test_Interpolants.py b/test/test_Interpolants.py → optimism/test/test_Interpolants.py
diff --git a/test/test_JaxConfig.py → optimism/test/test_JaxConfig.py b/test/test_JaxConfig.py → optimism/test/test_JaxConfig.py
diff --git a/test/test_LinAlg.py → optimism/test/test_LinAlg.py b/test/test_LinAlg.py → optimism/test/test_LinAlg.py
diff --git a/test/test_Math.py → optimism/test/test_Math.py b/test/test_Math.py → optimism/test/test_Math.py
@@ -5,7 +5,7 @@
 import jax.numpy as np
 
 from optimism import Math
-from . import TestFixture
+from optimism.test import TestFixture
 
 SUM_TESTDATA_FILENAME = os.path.join(os.path.dirname(__file__), 'ill_conditioned_sum_data.npz')
 DOTPROD_TESTDATA_FILENAME = os.path.join(os.path.dirname(__file__), 'ill_conditioned_dot_product_data.npz')

diff --git a/test/test_Mechanics.py → optimism/test/test_Mechanics.py b/test/test_Mechanics.py → optimism/test/test_Mechanics.py
diff --git a/test/test_Mesh.py → optimism/test/test_Mesh.py b/test/test_Mesh.py → optimism/test/test_Mesh.py
diff --git a/test/test_MinimizeScalar.py → optimism/test/test_MinimizeScalar.py b/test/test_MinimizeScalar.py → optimism/test/test_MinimizeScalar.py
diff --git a/test/test_Newmark.py → optimism/test/test_Newmark.py b/test/test_Newmark.py → optimism/test/test_Newmark.py
diff --git a/test/test_Objective.py → optimism/test/test_Objective.py b/test/test_Objective.py → optimism/test/test_Objective.py
diff --git a/test/test_PatchTest.py → optimism/test/test_PatchTest.py b/test/test_PatchTest.py → optimism/test/test_PatchTest.py
diff --git a/test/test_PatchTestPou.py → optimism/test/test_PatchTestPou.py b/test/test_PatchTestPou.py → optimism/test/test_PatchTestPou.py
diff --git a/test/test_QuadratureRule.py → optimism/test/test_QuadratureRule.py b/test/test_QuadratureRule.py → optimism/test/test_QuadratureRule.py
diff --git a/test/test_ReadExodusMesh.py → optimism/test/test_ReadExodusMesh.py b/test/test_ReadExodusMesh.py → optimism/test/test_ReadExodusMesh.py
diff --git a/test/test_ReadMesh.py → optimism/test/test_ReadMesh.py b/test/test_ReadMesh.py → optimism/test/test_ReadMesh.py
diff --git a/test/test_ScalarRootFinder.py → optimism/test/test_ScalarRootFinder.py b/test/test_ScalarRootFinder.py → optimism/test/test_ScalarRootFinder.py
diff --git a/test/test_SmoothFunctions.py → optimism/test/test_SmoothFunctions.py b/test/test_SmoothFunctions.py → optimism/test/test_SmoothFunctions.py
diff --git a/test/test_SparseMatrix.py → optimism/test/test_SparseMatrix.py b/test/test_SparseMatrix.py → optimism/test/test_SparseMatrix.py
diff --git a/test/test_SparsePreconditioner.py → optimism/test/test_SparsePreconditioner.py b/test/test_SparsePreconditioner.py → optimism/test/test_SparsePreconditioner.py
diff --git a/test/test_Surface.py → optimism/test/test_Surface.py b/test/test_Surface.py → optimism/test/test_Surface.py
diff --git a/test/test_TensorMath.py → optimism/test/test_TensorMath.py b/test/test_TensorMath.py → optimism/test/test_TensorMath.py
diff --git a/test/test_Traction.py → optimism/test/test_Traction.py b/test/test_Traction.py → optimism/test/test_Traction.py
diff --git a/test/test_TrustRegionSPG.py → optimism/test/test_TrustRegionSPG.py b/test/test_TrustRegionSPG.py → optimism/test/test_TrustRegionSPG.py
diff --git a/test/test_VTKWriter.py → optimism/test/test_VTKWriter.py b/test/test_VTKWriter.py → optimism/test/test_VTKWriter.py
diff --git a/test/test_VolumeAverageJ.py → optimism/test/test_VolumeAverageJ.py b/test/test_VolumeAverageJ.py → optimism/test/test_VolumeAverageJ.py
diff --git a/test/treigen/run_tests.sh → optimism/treigen/test/run_tests.sh b/test/treigen/run_tests.sh → optimism/treigen/test/run_tests.sh
diff --git a/test/treigen/test_treigen.py → optimism/treigen/test/test_treigen.py b/test/treigen/test_treigen.py → optimism/treigen/test/test_treigen.py
diff --git a/test/treigen/testutils.py → optimism/treigen/test/testutils.py b/test/treigen/testutils.py → optimism/treigen/test/testutils.py