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

Brandon's testing preference.

Author: ralberd

.coveragerc

@@ -0,0 +1,7 @@
+[run]
+omit = optimism/test/*
+       optimism/contact/test/*
+       optimism/inverse/test/*
+       optimism/material/test/*
+       optimism/phasefield/test/*
+       optimism/treigen/test/*

.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

test/.gitignore renamed to optimism/contact/test/.gitignore

@@ -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

test/__init__.py renamed to optimism/contact/test/__init__.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
 

test/contact/test_Contact.py renamed to optimism/contact/test/test_Contact.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):

test/contact/test_Cpp.py renamed to optimism/contact/test/test_Cpp.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

test/contact/test_EdgeIntersection.py renamed to optimism/contact/test/test_EdgeIntersection.py

@@ -1,4 +1,4 @@
-from ..TestFixture import *
+from optimism.test.TestFixture import *
 from optimism import QuadratureRule
 from optimism.contact import MortarContact
 import jax

test/contact/test_LevelsetConstraint.py renamed to optimism/contact/test/test_LevelsetConstraint.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