chore: cleanup tests

Author: Mahad-10

tests/codec_test.py

@@ -1,3 +1,4 @@
+import os
 import base64
 from pathlib import Path
 from typing import Type, TypeVar, Any
@@ -7,8 +8,8 @@
 
 from xconn.client import connect_anonymous
 from xconn import codec
-from xconn.types import Invocation, Result, Event
-from tests.profile_pb2 import ProfileCreate, ProfileGet
+from xconn.types import Event
+from tests.schemas.profile_pb2 import ProfileCreate, ProfileGet
 
 
 class String(str):
@@ -36,15 +37,6 @@ def test_base64_codec():
     assert decoded == "hello"
 
 
-def test_something():
-    # session = connect_anonymous("ws://localhost:8080/ws", "realm1")
-    # session.set_payload_codec(Base64Codec())
-    # result = session.call_object("io.xconn.object", String("hello"), String)
-    # print(result)
-    # session.leave()
-    pass
-
-
 class ProtobufCodec(codec.Codec[Message]):
     def name(self) -> str:
         return "protobuf"
@@ -55,28 +47,24 @@ def encode(self, obj: Message) -> bytes:
     def decode(self, data: bytes, out_type: Type[Message]) -> Message:
         msg = out_type()
         msg.ParseFromString(data)
+
         return msg
 
 
-def test_protobuf_codec():
+def test_rpc_object_protobuf():
     session = connect_anonymous("ws://localhost:8080/ws", "realm1")
     session.set_payload_codec(ProtobufCodec())
 
-    def inv_handler(inv: Invocation) -> Result:
-        profile = ProfileCreate()
-        profile.ParseFromString(inv.args[0])
-
-        profile_get = ProfileGet(
+    def inv_handler(profile: ProfileCreate) -> ProfileGet:
+        return ProfileGet(
             id="123",
             username=profile.username,
             email=profile.email,
             age=profile.age,
             created_at="2025-10-28T17:00:00Z",
         )
 
-        return Result(args=[profile_get.SerializeToString()])
-
-    session.register("io.xconn.profile.create", inv_handler)
+    session.register_object("io.xconn.profile.create", inv_handler)
     create_msg = ProfileCreate(username="john", email="[email protected]", age=25)
 
     result = session.call_object("io.xconn.profile.create", create_msg, ProfileGet)
@@ -104,7 +92,25 @@ def event_handler(event: Event):
     session.leave()
 
 
-def test_register_object_one_param_with_return_type():
+def test_pubsub_protobuf():
+    session = connect_anonymous("ws://localhost:8080/ws", "realm1")
+    session.set_payload_codec(ProtobufCodec())
+
+    def event_handler(event: Event):
+        user: ProfileCreate = event.args[0]
+        assert user.username == "john"
+        assert user.email == "[email protected]"
+        assert user.age == 25
+
+    session.subscribe_object("io.xconn.object", event_handler, ProfileCreate)
+
+    create_msg = ProfileCreate(username="john", email="[email protected]", age=25)
+    session.publish_object("io.xconn.object", create_msg)
+
+    session.leave()
+
+
+def test_rpc_object_one_param_with_return_type():
     session = connect_anonymous("ws://localhost:8080/ws", "realm1")
     session.set_payload_codec(ProtobufCodec())
 
@@ -120,10 +126,7 @@ def create_profile_handler(prof: ProfileCreate) -> ProfileGet:
     session.register_object("io.xconn.profile.create", create_profile_handler)
 
     profile_create = ProfileCreate(username="john", email="[email protected]", age=25)
-    result = session.call("io.xconn.profile.create", [profile_create.SerializeToString()])
-
-    profile = ProfileGet()
-    profile.ParseFromString(result.args[0])
+    profile = session.call_object("io.xconn.profile.create", profile_create, ProfileGet)
 
     assert profile.id == "356"
     assert profile.username == "john"
@@ -134,7 +137,7 @@ def create_profile_handler(prof: ProfileCreate) -> ProfileGet:
     session.leave()
 
 
-def test_register_object_no_param():
+def test_rpc_object_no_param():
     session = connect_anonymous("ws://localhost:8080/ws", "realm1")
     session.set_payload_codec(ProtobufCodec())
 
@@ -145,16 +148,15 @@ def invocation_handler() -> None:
 
     session.register_object("io.xconn.param.none", invocation_handler)
 
-    result = session.call("io.xconn.param.none")
+    result = session.call_object("io.xconn.param.none")
 
     assert options["flag"] is True
-    assert result.args is None
-    assert result.kwargs is None
+    assert result is None
 
     session.leave()
 
 
-def test_register_object_no_param_with_return():
+def test_rpc_object_no_param_with_return():
     session = connect_anonymous("ws://localhost:8080/ws", "realm1")
     session.set_payload_codec(ProtobufCodec())
 
@@ -169,10 +171,7 @@ def get_profile_handler() -> ProfileGet:
 
     session.register_object("io.xconn.profile.get", get_profile_handler)
 
-    result = session.call("io.xconn.profile.get")
-
-    profile = ProfileGet()
-    profile.ParseFromString(result.args[0])
+    profile = session.call_object("io.xconn.profile.get", return_type=ProfileGet)
 
     assert profile.id == "636"
     assert profile.username == "admin"
@@ -184,8 +183,10 @@ def get_profile_handler() -> ProfileGet:
 
 
 T = TypeVar("T")
-SCHEMA_PATH = Path(__file__).parent / "user.capnp"
-user_capnp = capnp.load(str(SCHEMA_PATH))
+
+root_dir = Path(__file__).resolve().parent
+module_file = os.path.join(root_dir, "schemas", "user.capnp")
+user_capnp = capnp.load(str(module_file))
 
 UserCreate = user_capnp.UserCreate
 UserGet = user_capnp.UserGet
@@ -202,7 +203,7 @@ def decode(self, data: bytes, out_type: Type[T]) -> T:
         return out_type.from_bytes_packed(data)
 
 
-def test_register_object_capnproto():
+def test_rpc_object_capnproto():
     session = connect_anonymous("ws://localhost:8080/ws", "realm1")
     session.set_payload_codec(CapnpProtoCodec())
 
@@ -223,8 +224,7 @@ def create_handler(user_create: UserCreate) -> UserGet:
     new_user.email = "[email protected]"
     new_user.age = 35
 
-    result = session.call("io.xconn.user.create", [new_user.to_bytes_packed()])
-    user = UserGet.from_bytes_packed(result.args[0])
+    user = session.call_object("io.xconn.user.create", new_user, UserGet)
 
     assert user.id == 999
     assert user.name == "john"
@@ -235,44 +235,12 @@ def create_handler(user_create: UserCreate) -> UserGet:
     session.leave()
 
 
-def test_call_object_capnproto():
-    session = connect_anonymous("ws://localhost:8080/ws", "realm1")
-    session.set_payload_codec(CapnpProtoCodec())
-
-    def invocation_handler(inv: Invocation) -> Result:
-        user_create = UserCreate.from_bytes_packed(inv.args[0])
-
-        user_get = UserGet.new_message()
-        user_get.id = 78
-        user_get.name = user_create.name
-        user_get.email = user_create.email
-        user_get.age = user_create.age
-        user_get.isAdmin = True
-
-        return Result(args=[user_get.to_bytes_packed()])
-
-    session.register("io.xconn.user.create", invocation_handler)
-    new_user = UserCreate.new_message()
-    new_user.name = "alice"
-    new_user.email = "[email protected]"
-    new_user.age = 23
-
-    result: UserGet = session.call_object("io.xconn.user.create", new_user, UserGet)
-    assert result.id == 78
-    assert result.name == "alice"
-    assert result.email == "[email protected]"
-    assert result.age == 23
-    assert result.isAdmin
-
-    session.leave()
-
-
 def test_pubsub_capnproto():
     session = connect_anonymous("ws://localhost:8080/ws", "realm1")
     session.set_payload_codec(CapnpProtoCodec())
 
     def event_handler(event: Event):
-        user: UserGet = event.args[0]
+        user: UserCreate = event.args[0]
         assert user.name == "alice"
         assert user.email == "[email protected]"
         assert user.age == 21

tests/schemas/__init__.py

@@ -202,14 +202,20 @@ def _process_incoming_message(self, msg: messages.Message):
     def set_payload_codec(self, codec: Codec) -> None:
         self._payload_codec = codec
 
-    def call_object(self, procedure: str, request: TReq, return_type: Type[TRes] = None) -> TReq | None:
+    def call_object(self, procedure: str, request: TReq = None, return_type: Type[TRes] = None) -> TRes | None:
         if self._payload_codec is None:
             raise ValueError("no payload codec set")
 
-        encoded = self._payload_codec.encode(request)
-        result = self.call(procedure, [encoded])
+        if request is not None:
+            encoded = self._payload_codec.encode(request)
+            result = self.call(procedure, [encoded])
+        else:
+            result = self.call(procedure)
+
+        if return_type is not None:
+            return self._payload_codec.decode(result.args[0], return_type)
 
-        return self._payload_codec.decode(result.args[0], return_type)
+        return None
 
     def subscribe_object(self, topic: str, event_handler: Callable[[types.Event], None], return_type: Type[TRes]):
         if self._payload_codec is None: