test: fix e2e tests

Author: alemidev

Cargo.toml

@@ -76,15 +76,15 @@ pyo3-build-config = { version = "0.28", optional = true }
 pyo3-introspection = { version = "0.28", optional = true }
 
 [features]
-default = ["lua-jit", "py-abi3", "py-extmod", "test-coverage"]
+default = ["lua-jit", "py-abi3", "py-extmod"]
 proto = ["dep:codemp-proto"]
 client = ["proto", "dep:tonic", "dep:tokio", "dep:tokio-stream", "dep:dashmap", "codemp-proto?/client"]
 server = ["proto", "codemp-proto?/server"]
 # extra
 async-trait = ["dep:async-trait"]
 serialize = ["dep:serde", "uuid?/serde"]
 # special tests which require more setup
-test-e2e = ["dep:uuid"]
+test-e2e = ["client", "dep:uuid"]
 test-coverage = ["dep:syn", "dep:regex"]
 # ffi
 java = ["client", "dep:jni", "dep:tracing-subscriber", "dep:jni-toolbox", "codemp-proto/java"]

src/tests/coverage/ffi.rs

@@ -1,4 +1,4 @@
-#![allow(missing_docs)] // internal test helper
+#![allow(missing_docs, clippy::unwrap_used)] // internal test helper
 
 use std::collections::{BTreeMap, BTreeSet};
 

src/tests/e2e/fixtures.rs

@@ -57,16 +57,16 @@ impl ClientFixture {
 	}
 }
 
-impl ScopedFixture<crate::Client> for ClientFixture {
-	async fn setup(&mut self) -> Result<crate::Client, Box<dyn Error>> {
+impl ScopedFixture<crate::Session> for ClientFixture {
+	async fn setup(&mut self) -> Result<crate::Session, Box<dyn Error>> {
 		let upper = self.name.to_uppercase();
 		let username = self.username.clone().unwrap_or_else(|| {
 			std::env::var(format!("CODEMP_TEST_USERNAME_{upper}")).unwrap_or_default()
 		});
 		let password = self.password.clone().unwrap_or_else(|| {
 			std::env::var(format!("CODEMP_TEST_PASSWORD_{upper}")).unwrap_or_default()
 		});
-		let client = crate::Client::connect(crate::api::Config {
+		let client = crate::Session::connect(crate::api::Config {
 			username,
 			password,
 			tls: Some(false),
@@ -110,15 +110,15 @@ impl WorkspaceFixture {
 	}
 }
 
-impl ScopedFixture<(crate::Client, crate::Workspace)> for WorkspaceFixture {
-	async fn setup(&mut self) -> Result<(crate::Client, crate::Workspace), Box<dyn Error>> {
+impl ScopedFixture<(crate::Session, crate::Workspace)> for WorkspaceFixture {
+	async fn setup(&mut self) -> Result<(crate::Session, crate::Workspace), Box<dyn Error>> {
 		let client = ClientFixture::of(&self.user).setup().await?;
 		client.create_workspace(self.workspace.to_string()).await?;
 		let workspace = client.attach_workspace(&self.user, &self.workspace).await?;
 		Ok((client, workspace))
 	}
 
-	async fn cleanup(&mut self, resource: Option<(crate::Client, crate::Workspace)>) {
+	async fn cleanup(&mut self, resource: Option<(crate::Session, crate::Workspace)>) {
 		if let Some((client, workspace)) = resource {
 			client.leave_workspace(&client.current_user().name, &workspace.id().workspace);
 			if let Err(e) = client.delete_workspace(self.workspace.clone()).await {
@@ -130,19 +130,19 @@ impl ScopedFixture<(crate::Client, crate::Workspace)> for WorkspaceFixture {
 
 impl
 	ScopedFixture<(
-		crate::Client,
+		crate::Session,
 		crate::Workspace,
-		crate::Client,
+		crate::Session,
 		crate::Workspace,
 	)> for WorkspaceFixture
 {
 	async fn setup(
 		&mut self,
 	) -> Result<
 		(
-			crate::Client,
+			crate::Session,
 			crate::Workspace,
-			crate::Client,
+			crate::Session,
 			crate::Workspace,
 		),
 		Box<dyn Error>,
@@ -173,9 +173,9 @@ impl
 	async fn cleanup(
 		&mut self,
 		resource: Option<(
-			crate::Client,
+			crate::Session,
 			crate::Workspace,
-			crate::Client,
+			crate::Session,
 			crate::Workspace,
 		)>,
 	) {
@@ -226,24 +226,24 @@ impl BufferFixture {
 
 impl
 	ScopedFixture<(
-		crate::Client,
+		crate::Session,
 		crate::Workspace,
-		crate::buffer::Controller,
-		crate::Client,
+		crate::client::buffer::Controller,
+		crate::Session,
 		crate::Workspace,
-		crate::buffer::Controller,
+		crate::client::buffer::Controller,
 	)> for BufferFixture
 {
 	async fn setup(
 		&mut self,
 	) -> Result<
 		(
-			crate::Client,
+			crate::Session,
 			crate::Workspace,
-			crate::buffer::Controller,
-			crate::Client,
+			crate::client::buffer::Controller,
+			crate::Session,
 			crate::Workspace,
-			crate::buffer::Controller,
+			crate::client::buffer::Controller,
 		),
 		Box<dyn Error>,
 	> {
@@ -288,12 +288,12 @@ impl
 	async fn cleanup(
 		&mut self,
 		resource: Option<(
-			crate::Client,
+			crate::Session,
 			crate::Workspace,
-			crate::buffer::Controller,
-			crate::Client,
+			crate::client::buffer::Controller,
+			crate::Session,
 			crate::Workspace,
-			crate::buffer::Controller,
+			crate::client::buffer::Controller,
 		)>,
 	) {
 		if let Some((client, ws, _, _, _, _)) = resource {