Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prevent repeating tests from imports #78

Merged
merged 1 commit into from
Jan 21, 2024
Merged

prevent repeating tests from imports #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/unit/potential/builtin/test_bar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import galax.potential as gp

from ..test_core import TestAbstractPotential
from ..test_core import TestAbstractPotential as AbstractPotential_Test
from .test_common import (
MassParameterMixin,
ShapeAParameterMixin,
Expand All @@ -15,7 +15,7 @@


class TestBarPotential(
TestAbstractPotential,
AbstractPotential_Test,
# Parameters
MassParameterMixin,
ShapeAParameterMixin,
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/potential/builtin/test_hernquist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

from galax.potential import HernquistPotential

from ..test_core import TestAbstractPotential
from ..test_core import TestAbstractPotential as AbstractPotential_Test
from .test_common import MassParameterMixin, ShapeCParameterMixin


class TestHernquistPotential(
TestAbstractPotential,
AbstractPotential_Test,
# Parameters
MassParameterMixin,
ShapeCParameterMixin,
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/potential/builtin/test_isochrone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import galax.potential as gp

from ..test_core import TestAbstractPotential
from ..test_core import TestAbstractPotential as AbstractPotential_Test
from .test_common import MassParameterMixin, ShapeAParameterMixin


class TestIsochronePotential(
TestAbstractPotential,
AbstractPotential_Test,
# Parameters
MassParameterMixin,
ShapeAParameterMixin,
Expand Down
10 changes: 3 additions & 7 deletions tests/unit/potential/builtin/test_miyamotonagai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@

import galax.potential as gp

from ..test_core import TestAbstractPotential
from .test_common import (
MassParameterMixin,
ShapeAParameterMixin,
ShapeBParameterMixin,
)
from ..test_core import TestAbstractPotential as AbstractPotential_Test
from .test_common import MassParameterMixin, ShapeAParameterMixin, ShapeBParameterMixin


class TestMiyamotoNagaiPotential(
TestAbstractPotential,
AbstractPotential_Test,
# Parameters
MassParameterMixin,
ShapeAParameterMixin,
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/potential/builtin/test_nfw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from galax.units import galactic

from ..params.test_field import ParameterFieldMixin
from ..test_core import TestAbstractPotential
from ..test_core import TestAbstractPotential as AbstractPotential_Test
from .test_common import MassParameterMixin


Expand Down Expand Up @@ -47,7 +47,7 @@ def test_r_s_userfunc(self, pot_cls, fields):


class TestNFWPotential(
TestAbstractPotential,
AbstractPotential_Test,
# Parameters
MassParameterMixin,
ScaleRadiusParameterMixin,
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/potential/builtin/test_null.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import galax.potential as gp

from ..test_core import TestAbstractPotential
from ..test_core import TestAbstractPotential as AbstractPotential_Test


class TestBarPotential(TestAbstractPotential):
class TestBarPotential(AbstractPotential_Test):
@pytest.fixture(scope="class")
def pot_cls(self) -> type[gp.NullPotential]:
return gp.NullPotential
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/potential/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
from galax.units import UnitSystem, dimensionless, galactic
from galax.utils import partial_jit, vectorize_method

from .test_base import TestAbstractPotentialBase
from .test_base import TestAbstractPotentialBase as AbstractPotentialBase_Test
from .test_utils import FieldUnitSystemMixin


class TestAbstractPotential(TestAbstractPotentialBase, FieldUnitSystemMixin):
class TestAbstractPotential(AbstractPotentialBase_Test, FieldUnitSystemMixin):
"""Test the `galax.potential.AbstractPotentialBase` class."""

@pytest.fixture(scope="class")
Expand Down