aboutsummaryrefslogtreecommitdiffstats
path: root/t/overrides_test.py
diff options
context:
space:
mode:
Diffstat (limited to 't/overrides_test.py')
-rw-r--r--t/overrides_test.py70
1 files changed, 35 insertions, 35 deletions
diff --git a/t/overrides_test.py b/t/overrides_test.py
index 683d071..3993af7 100644
--- a/t/overrides_test.py
+++ b/t/overrides_test.py
@@ -15,39 +15,39 @@ def call_method_at_class(c, method_name, invocant, *args, **kwargs):
class OverridesTest(unittest.TestCase):
def test_accessor_generation(self):
- AccessorsMetaclass = mop.Class.new(
+ AccessorsMetaclass = mop.Class(
name="AccessorsMetaclass",
superclass=mop.Class,
)
def add_attribute(self, attr):
name = attr.name()
call_method_at_class(mop.Class, "add_attribute", self, attr)
- self.add_method(self.method_class().new(
+ self.add_method(self.method_class()(
name=name,
body=lambda self: self.metaclass.all_attributes()[name].value(self),
))
- AccessorsMetaclass.add_method(AccessorsMetaclass.metaclass.method_class().new(
+ AccessorsMetaclass.add_method(AccessorsMetaclass.metaclass.method_class()(
name="add_attribute",
body=add_attribute,
))
AccessorsMetaclass.finalize()
- Point = AccessorsMetaclass.new(
+ Point = AccessorsMetaclass(
name="Point",
superclass=AccessorsMetaclass.base_object_class(),
)
- Point.add_attribute(Point.attribute_class().new(name="x", default=0))
- Point.add_attribute(Point.attribute_class().new(name="y", default=0))
+ Point.add_attribute(Point.attribute_class()(name="x", default=0))
+ Point.add_attribute(Point.attribute_class()(name="y", default=0))
Point.finalize()
- point = Point.new(x=1, y=2)
+ point = Point(x=1, y=2)
assert point.x() == 1
assert point.y() == 2
def test_trace_method_calls(self):
methods_called = []
- TraceMethod = mop.Class.new(
+ TraceMethod = mop.Class(
name="TraceMethod",
superclass=mop.Method,
)
@@ -55,39 +55,39 @@ class OverridesTest(unittest.TestCase):
def execute(self, invocant, args, kwargs):
methods_called.append(self.name())
return call_method_at_class(mop.Method, "execute", self, invocant, args, kwargs)
- TraceMethod.add_method(TraceMethod.metaclass.method_class().new(
+ TraceMethod.add_method(TraceMethod.metaclass.method_class()(
name="execute",
body=execute,
))
TraceMethod.finalize()
- TraceClass = mop.Class.new(
+ TraceClass = mop.Class(
name="TraceClass",
superclass=mop.Class,
)
- TraceClass.add_method(TraceClass.metaclass.method_class().new(
+ TraceClass.add_method(TraceClass.metaclass.method_class()(
name="method_class",
body=lambda self: TraceMethod,
))
TraceClass.finalize()
- Point = TraceClass.new(
+ Point = TraceClass(
name="Point",
superclass=TraceClass.base_object_class(),
)
- Point.add_attribute(Point.attribute_class().new(name="x", default=0))
- Point.add_attribute(Point.attribute_class().new(name="y", default=0))
- Point.add_method(Point.method_class().new(
+ Point.add_attribute(Point.attribute_class()(name="x", default=0))
+ Point.add_attribute(Point.attribute_class()(name="y", default=0))
+ Point.add_method(Point.method_class()(
name="x",
body=lambda self: self.metaclass.all_attributes()["x"].value(self)
))
- Point.add_method(Point.method_class().new(
+ Point.add_method(Point.method_class()(
name="y",
body=lambda self: self.metaclass.all_attributes()["y"].value(self)
))
Point.finalize()
- point = Point.new(x=1, y=2)
+ point = Point(x=1, y=2)
assert methods_called == []
assert point.x() == 1
assert methods_called == ['x']
@@ -95,79 +95,79 @@ class OverridesTest(unittest.TestCase):
assert methods_called == ['x', 'y']
def test_db_backed_object(self):
- DatabaseAttribute = mop.Class.new(
+ DatabaseAttribute = mop.Class(
name="DatabaseAttribute",
superclass=mop.Attribute,
)
- DatabaseAttribute.add_attribute(DatabaseAttribute.attribute_class().new(
+ DatabaseAttribute.add_attribute(DatabaseAttribute.attribute_class()(
name="db",
))
- DatabaseAttribute.add_method(DatabaseAttribute.method_class().new(
+ DatabaseAttribute.add_method(DatabaseAttribute.method_class()(
name="db",
body=lambda self: self.metaclass.all_attributes()["db"].value(self)
))
def value(self, instance):
key = str(hash(instance)) + ":" + self.name()
return self.db().lookup(key)
- DatabaseAttribute.add_method(DatabaseAttribute.method_class().new(
+ DatabaseAttribute.add_method(DatabaseAttribute.method_class()(
name="value",
body=value,
))
def set_value(self, instance, new_value):
key = str(hash(instance)) + ":" + self.name()
self.db().insert(key, new_value)
- DatabaseAttribute.add_method(DatabaseAttribute.method_class().new(
+ DatabaseAttribute.add_method(DatabaseAttribute.method_class()(
name="set_value",
body=set_value,
))
DatabaseAttribute.finalize()
- DatabaseBackedClass = mop.Class.new(
+ DatabaseBackedClass = mop.Class(
name="DatabaseBackedClass",
superclass=mop.Class,
)
- DatabaseBackedClass.add_attribute(DatabaseBackedClass.attribute_class().new(
+ DatabaseBackedClass.add_attribute(DatabaseBackedClass.attribute_class()(
name="db",
))
- DatabaseBackedClass.add_method(DatabaseBackedClass.method_class().new(
+ DatabaseBackedClass.add_method(DatabaseBackedClass.method_class()(
name="db",
body=lambda self: self.metaclass.all_attributes()["db"].value(self)
))
def add_attribute(self, attr):
attr.metaclass.all_attributes()["db"].set_value(attr, self.db())
call_method_at_class(mop.Class, "add_attribute", self, attr)
- DatabaseBackedClass.add_method(DatabaseBackedClass.method_class().new(
+ DatabaseBackedClass.add_method(DatabaseBackedClass.method_class()(
name="add_attribute",
body=add_attribute,
))
- DatabaseBackedClass.add_method(DatabaseBackedClass.method_class().new(
+ DatabaseBackedClass.add_method(DatabaseBackedClass.method_class()(
name="attribute_class",
body=lambda self: DatabaseAttribute,
))
DatabaseBackedClass.finalize()
- Point = DatabaseBackedClass.new(
+ Point = DatabaseBackedClass(
name="Point",
superclass=DatabaseBackedClass.base_object_class(),
db=InMemoryDatabase(),
)
- Point.add_attribute(Point.attribute_class().new(name="x", default=0))
- Point.add_attribute(Point.attribute_class().new(name="y", default=0))
- Point.add_method(Point.method_class().new(
+ Point.add_attribute(Point.attribute_class()(name="x", default=0))
+ Point.add_attribute(Point.attribute_class()(name="y", default=0))
+ Point.add_method(Point.method_class()(
name="x",
body=lambda self: self.metaclass.all_attributes()["x"].value(self)
))
- Point.add_method(Point.method_class().new(
+ Point.add_method(Point.method_class()(
name="y",
body=lambda self: self.metaclass.all_attributes()["y"].value(self)
))
- Point.add_method(Point.method_class().new(
+ Point.add_method(Point.method_class()(
name="set_x",
body=lambda self, new_value: self.metaclass.all_attributes()["x"].set_value(self, new_value)
))
Point.finalize()
- point = Point.new(x=3, y=7)
+ point = Point(x=3, y=7)
assert point.x() == 3
assert point.y() == 7
assert point.slots == {}
@@ -177,7 +177,7 @@ class OverridesTest(unittest.TestCase):
assert point.slots == {}
assert len(Point.db().store) == 2
- point2 = Point.new(x=123, y=-5)
+ point2 = Point(x=123, y=-5)
assert point.x() == 12
assert point.y() == 7
assert point.slots == {}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 19:46:11 +0000