Fix tests

# Conflicts:
#	packages/js-sdk/package-lock.json
#	packages/js-sdk/package.json

Author: jamesmurdza

packages/js-sdk/tests/mouse.test.ts

@@ -1,35 +1,39 @@
-import { expect } from 'vitest'
-import { sandboxTest } from './setup'
+import { expect } from "vitest";
+import { sandboxTest } from "./setup";
 
-sandboxTest('cursor position', async ({ sandbox }) => {
-  const pos = await sandbox.getCursorPosition()
-  const size = await sandbox.getScreenSize()
-  // By the default, the cursor's position is in the center of the screen
-  expect(pos).toEqual({ x: size.width / 2, y: size.height / 2 })
-})
+sandboxTest("cursor position", async ({ sandbox }) => {
+  const pos = await sandbox.getCursorPosition();
+  const size = await sandbox.getScreenSize();
+  if (size) {
+    // By the default, the cursor's position is in the center of the screen
+    expect(pos).toEqual({ x: size.width / 2, y: size.height / 2 });
+  } else {
+    throw new Error("Screen size is null");
+  }
+});
 
-sandboxTest('mouse move', async ({ sandbox }) => {
-  await sandbox.moveMouse(100, 200)
-  const pos2 = await sandbox.getCursorPosition()
-  expect(pos2).toEqual({ x: 100, y: 200 })
-})
+sandboxTest("mouse move", async ({ sandbox }) => {
+  await sandbox.moveMouse(100, 200);
+  const pos2 = await sandbox.getCursorPosition();
+  expect(pos2).toEqual({ x: 100, y: 200 });
+});
 
-sandboxTest('mouse left click', async ({ sandbox }) => {
+sandboxTest("mouse left click", async ({ sandbox }) => {
   // TODO: Implement
-})
+});
 
-sandboxTest('mouse double click', async ({ sandbox }) => {
+sandboxTest("mouse double click", async ({ sandbox }) => {
   // TODO: Implement
-})
+});
 
-sandboxTest('mouse right click', async ({ sandbox }) => {
+sandboxTest("mouse right click", async ({ sandbox }) => {
   // TODO: Implement
-})
+});
 
-sandboxTest('mouse middle click', async ({ sandbox }) => {
+sandboxTest("mouse middle click", async ({ sandbox }) => {
   // TODO: Implement
-})
+});
 
-sandboxTest('mouse scroll', async ({ sandbox }) => {
+sandboxTest("mouse scroll", async ({ sandbox }) => {
   // TODO: Implement
-})
+});

packages/python-sdk/poetry.lock

@@ -14,6 +14,7 @@ python = "^3.9"
 
 e2b = "^1.0.4"
 requests = "^2.32.3"
+pillow = "^11.1.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"

packages/python-sdk/pyproject.toml

@@ -2,6 +2,6 @@
 [pytest]
 markers =
     skip_debug: skip test if E2B_DEBUG is set.
-asyncio_mode=auto
+# asyncio_mode=auto
 
 addopts = "--import-mode=importlib" "--numprocesses=2"

packages/python-sdk/pytest.ini

@@ -1,34 +1,37 @@
 import pytest
 import os
-
-from logging import warning
-
+import logging
 from e2b_desktop import Sandbox
 
+# Set up timeout and logger
 timeout = 60
+logger = logging.getLogger(__name__)
 
-@pytest.fixture()
+@pytest.fixture(scope="function")
 def sandbox(debug):
+    # Create a new sandbox instance for each test
     sandbox = Sandbox(timeout=timeout)
 
     try:
         yield sandbox
     finally:
+        # Ensure proper cleanup
         try:
             sandbox.kill()
-        except:
+        except Exception as e:
             if not debug:
-                warning(
-                    "Failed to kill sandbox — this is expected if the test runs with local envd."
-                )
+                logger.warning(f"Failed to kill sandbox — this is expected if the test runs with local envd. Error: {e}")
 
 
 @pytest.fixture
 def debug():
+    # Determine if debugging is enabled
     return os.getenv("E2B_DEBUG") is not None
 
+
 @pytest.fixture(autouse=True)
 def skip_by_debug(request, debug):
+    # Skip test if E2B_DEBUG is set
     if request.node.get_closest_marker("skip_debug"):
         if debug:
             pytest.skip("skipped because E2B_DEBUG is set")

packages/python-sdk/tests/conftest.py

@@ -1,31 +1,67 @@
 import os
 import time
 from e2b_desktop import Sandbox
+from PIL import ImageChops, Image
+import io
 
-# def test_right_click(sandbox: Sandbox):
-#   sandbox.right_click()
-#   time.sleep(5)
-#   pos = sandbox.locate_on_screen("Create Document")
-#   print(pos)
-#   assert pos is not None
+def crop_around_point(image, cursor_pos):
+    x, y = cursor_pos
+    box = (x - 50, y - 50, x + 50, y + 50)  # 100x100 box
+    return image.crop(box)
 
+def images_are_equal(img1, img2):
+    # Use ImageChops to find the difference
+    diff = ImageChops.difference(img1, img2)
+    # Check if there is any difference
+    return diff.getbbox() is None  # Returns True if images are equal, False if different
 
-# def test_screenshot(sandbox: Sandbox):
-#   screenshot_path = "test-screenshot.png"
-#   sandbox.screenshot(screenshot_path)
-#   assert os.path.exists(screenshot_path)
+def test_right_click(sandbox: Sandbox):
+    # Capture the initial screenshot
+    initial_screenshot_bytes = sandbox.take_screenshot()
+    initial_image = Image.open(io.BytesIO(initial_screenshot_bytes))
+    
+    # Get cursor position and perform right click
+    cursor_pos = sandbox.get_cursor_position()
+    sandbox.right_click()
+    time.sleep(5)  # Wait for UI to respond
+    
+    # Capture and process the second screenshot
+    post_click_screenshot_bytes = sandbox.take_screenshot()
+    post_click_image = Image.open(io.BytesIO(post_click_screenshot_bytes))
+    
+    # Crop both images around the cursor position
+    cropped_image_1 = crop_around_point(initial_image, cursor_pos)
+    cropped_image_2 = crop_around_point(post_click_image, cursor_pos)
+    
+    # Compare the cropped images
+    assert not images_are_equal(cropped_image_1, cropped_image_2), "The image around the cursor did not change after right-click."
 
-# def test_get_cursor_position(sandbox: Sandbox):
-#   pos = sandbox.get_cursor_position()
-#   assert pos == (512, 384) # In the middle of the screen
+def test_screenshot(sandbox: Sandbox):
+    image = sandbox.take_screenshot()
+    assert image, "Screenshot was not taken successfully"
+    
+    # Check if the image is a valid image format
+    try:
+        img = Image.open(io.BytesIO(image))
+        img.verify()  # Verify that it is an image
+    except Exception:
+        assert False, "The screenshot is not a valid image."
 
+def test_get_cursor_position(sandbox: Sandbox):
+    pos = sandbox.get_cursor_position()
+    assert pos == (512, 384), f"Expected cursor position to be (512, 384), but got {pos}"
 
-# def test_get_screen_size(sandbox: Sandbox):
-#   size = sandbox.get_screen_size()
-#   assert size == (1024, 768) # 1024x768 screen
 
-# def test_write(sandbox: Sandbox):
-#   # Create a file and open it in a text editor
-#   text_file_path = "/home/user/test.txt"
-#   sandbox.write(text_file_path, "hello")
-#   sandbox.open_file(text_file_path)
+def test_get_screen_size(sandbox: Sandbox):
+    size = sandbox.get_screen_size()
+    assert size == (1024, 768), f"Expected screen size to be (1024, 768), but got {size}"
+
+
+def test_write(sandbox: Sandbox):
+    # Create a file and open it in a text editor
+    text_file_path = "/home/user/test.txt"
+    sandbox.files.write(text_file_path, "hello")
+    sandbox.open(text_file_path)
+    # Add an assertion here, perhaps check if the content is correct
+    content = sandbox.files.read(text_file_path)
+    assert content == "hello", f"Expected content 'hello' in {text_file_path}, but got {content}"