Skip to content

Commit

Permalink
Change name of Test class to prevent pytest complaining
Browse files Browse the repository at this point in the history 
All classes names "Test*" are inspected by pytest
as possible test cases. It warns when it can't find any. Fix
those warnings by renaming the classes.
  • Loading branch information
@timj
timj committed Jul 9, 2021
1 parent 6afcd26 commit 85d9a85
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions tests/test_configurableActions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from lsst.pex.config import Config, Field, FieldValidationError


class TestAction1(ConfigurableAction):
class ActionTest1(ConfigurableAction):
var = Field(doc="test field", dtype=int, default=0)

def __call__(self):
Expand All @@ -37,7 +37,7 @@ def validate(self):
assert(self.var is not None)


class TestAction2(ConfigurableAction):
class ActionTest2(ConfigurableAction):
var = Field(doc="test field", dtype=int, default=1)

def __call__(self):
Expand All @@ -47,7 +47,7 @@ def validate(self):
assert(self.var is not None)


class TestAction3(ConfigurableAction):
class ActionTest3(ConfigurableAction):
var = Field(doc="test field", dtype=int, default=3)

def __call__(self):
Expand All @@ -72,7 +72,7 @@ def testConfigInstatiation(self):
self.assertTrue(hasattr(config, "singleAction"))

# test again with default values
configClass = self._createConfig(default={"test1": TestAction1}, singleDefault=TestAction1)
configClass = self._createConfig(default={"test1": ActionTest1}, singleDefault=ActionTest1)
config = configClass()

# verify the defaults were created
Expand All @@ -86,76 +86,76 @@ def testConfigInstatiation(self):
def testAssignment(self):
# Struct actions
# Test that a new action can be added with assignment
configClass = self._createConfig(default={"test1": TestAction1})
configClass = self._createConfig(default={"test1": ActionTest1})
config = configClass()
config.actions.test2 = TestAction2
config.actions.test2 = ActionTest2

self.assertEqual(tuple(config.actions.fieldNames), ("test1", "test2"))
self.assertEqual(config.actions.test2.var, 1)

# verify the same as above, but assigning with instances
configClass = self._createConfig(default={"test1": TestAction1})
configClass = self._createConfig(default={"test1": ActionTest1})
config = configClass()
config.actions.test3 = TestAction3()
config.actions.test3 = ActionTest3()

self.assertEqual(tuple(config.actions.fieldNames), ("test1", "test3"))
self.assertEqual(config.actions.test3.var, 3)

# The following is designed to support pipeline config setting
# Test assignment using the update accessor
configClass = self._createConfig(default={"test1": TestAction1})
configClass = self._createConfig(default={"test1": ActionTest1})
config = configClass()
config.actions.update = {"test2": TestAction2, "test3": TestAction3}
config.actions.update = {"test2": ActionTest2, "test3": ActionTest3}

self.assertEqual(tuple(config.actions.fieldNames), ("test1", "test2", "test3"))

configClass = self._createConfig(default={"test1": TestAction1})
configClass2 = self._createConfig(default={"test2": TestAction2, "test3": TestAction3})
configClass = self._createConfig(default={"test1": ActionTest1})
configClass2 = self._createConfig(default={"test2": ActionTest2, "test3": ActionTest3})
config = configClass()
config2 = configClass2()
config.actions.update = config2.actions

self.assertEqual(tuple(config.actions.fieldNames), ("test1", "test2", "test3"))

# Test remove "assignment" using the remove accessor
configClass = self._createConfig(default={"test1": TestAction1, "test2": TestAction2,
"test3": TestAction3})
configClass = self._createConfig(default={"test1": ActionTest1, "test2": ActionTest2,
"test3": ActionTest3})
config = configClass()
config.actions.remove = ("test1", "test2")
self.assertEqual(tuple(config.actions.fieldNames), ("test3", ))

configClass = self._createConfig(default={"test1": TestAction1, "test2": TestAction2,
"test3": TestAction3})
configClass = self._createConfig(default={"test1": ActionTest1, "test2": ActionTest2,
"test3": ActionTest3})
config = configClass()
config.actions.remove = "test1"
self.assertEqual(tuple(config.actions.fieldNames), ("test2", "test3"))

# singleAction
# Test that an action can be reassigned
configClass = self._createConfig(singleDefault=TestAction1)
configClass = self._createConfig(singleDefault=ActionTest1)
config = configClass()
self.assertEqual(config.singleAction(), 0)

config.singleAction = TestAction2
config.singleAction = ActionTest2
self.assertEqual(config.singleAction(), 1)

config.singleAction = TestAction3()
config.singleAction = ActionTest3()
self.assertEqual(config.singleAction(), 3)

def testValidate(self):
configClass = self._createConfig(default={"test1": TestAction1, "test2": TestAction2,
"test3": TestAction3}, singleDefault=TestAction1)
configClass = self._createConfig(default={"test1": ActionTest1, "test2": ActionTest2,
"test3": ActionTest3}, singleDefault=ActionTest1)
config = configClass()
config.validate()

def testFreeze(self):
configClass = self._createConfig(default={"test1": TestAction1, "test2": TestAction2},
singleDefault=TestAction1)
configClass = self._createConfig(default={"test1": ActionTest1, "test2": ActionTest2},
singleDefault=ActionTest1)
config = configClass()
config.freeze()

with self.assertRaises(FieldValidationError):
config.actions.test3 = TestAction3
config.actions.test3 = ActionTest3

with self.assertRaises(FieldValidationError):
config.actions.test1.var = 2
Expand All @@ -164,14 +164,14 @@ def testFreeze(self):
config.actions.test2.var = 0

with self.assertRaises(FieldValidationError):
config.singleAction = TestAction2
config.singleAction = ActionTest2

with self.assertRaises(FieldValidationError):
config.singleAction.var = 3

def testCompare(self):
configClass = self._createConfig(default={"test1": TestAction1, "test2": TestAction2},
singleDefault=TestAction1)
configClass = self._createConfig(default={"test1": ActionTest1, "test2": ActionTest2},
singleDefault=ActionTest1)
config = configClass()
config2 = configClass()

Expand All @@ -191,8 +191,8 @@ def testSave(self):
# This method will also test rename, as it is part of the
# implementation in pex_config
ioObject = StringIO()
configClass = self._createConfig(default={"test1": TestAction1},
singleDefault=TestAction1)
configClass = self._createConfig(default={"test1": ActionTest1},
singleDefault=ActionTest1)
config = configClass()

config.saveToStream(ioObject)
Expand All @@ -205,8 +205,8 @@ def testSave(self):

def testToDict(self):
"""Test the toDict interface"""
configClass = self._createConfig(default={"test1": TestAction1},
singleDefault=TestAction1)
configClass = self._createConfig(default={"test1": ActionTest1},
singleDefault=ActionTest1)
config = configClass()
self.assertEqual(config.toDict(), {'actions': {'test1': {'var': 0}}, 'singleAction': {'var': 0}})

Expand Down

0 comments on commit 85d9a85

Please sign in to comment.