From 27e3fc0990ce931f015a2bb21b6736fe621a0606 Mon Sep 17 00:00:00 2001
From: jbb01 <32650546+jbb01@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:14:59 +0200
Subject: [PATCH] fix tests

---
 .../render/{ => canvas}/ImageTest.java           | 16 +++++++++-------
 .../scene/{ => hittable3d}/SphereTest.java       |  6 ++++--
 2 files changed, 13 insertions(+), 9 deletions(-)
 rename src/test/java/eu/jonahbauer/raytracing/render/{ => canvas}/ImageTest.java (65%)
 rename src/test/java/eu/jonahbauer/raytracing/scene/{ => hittable3d}/SphereTest.java (72%)

diff --git a/src/test/java/eu/jonahbauer/raytracing/render/ImageTest.java b/src/test/java/eu/jonahbauer/raytracing/render/canvas/ImageTest.java
similarity index 65%
rename from src/test/java/eu/jonahbauer/raytracing/render/ImageTest.java
rename to src/test/java/eu/jonahbauer/raytracing/render/canvas/ImageTest.java
index 58976ac..9396f96 100644
--- a/src/test/java/eu/jonahbauer/raytracing/render/ImageTest.java
+++ b/src/test/java/eu/jonahbauer/raytracing/render/canvas/ImageTest.java
@@ -1,5 +1,7 @@
-package eu.jonahbauer.raytracing.render;
+package eu.jonahbauer.raytracing.render.canvas;
 
+import eu.jonahbauer.raytracing.render.Color;
+import eu.jonahbauer.raytracing.render.ImageFormat;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -17,18 +19,18 @@ class ImageTest {
     void test(@TempDir Path dir) throws IOException {
         var image = new Image(256, 256);
 
-        for (var y = 0; y < image.height(); y++) {
-            for (var x = 0; x < image.width(); x++) {
-                var r = (double) x / (image.width() - 1);
-                var g = (double) y / (image.height() - 1);
+        for (var y = 0; y < image.getHeight(); y++) {
+            for (var x = 0; x < image.getWidth(); x++) {
+                var r = (double) x / (image.getWidth() - 1);
+                var g = (double) y / (image.getHeight() - 1);
                 var b = 0;
 
-                image.set(x, y, r, g, b);
+                image.set(x, y, new Color(r, g, b));
             }
         }
 
         System.out.println(dir);
-        ImageIO.write(image, dir.resolve("img.ppm"));
+        ImageFormat.PPM.write(image, dir.resolve("img.ppm"));
 
         String expected;
         String actual;
diff --git a/src/test/java/eu/jonahbauer/raytracing/scene/SphereTest.java b/src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java
similarity index 72%
rename from src/test/java/eu/jonahbauer/raytracing/scene/SphereTest.java
rename to src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java
index 68c1bdb..0898d58 100644
--- a/src/test/java/eu/jonahbauer/raytracing/scene/SphereTest.java
+++ b/src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java
@@ -1,8 +1,10 @@
-package eu.jonahbauer.raytracing.scene;
+package eu.jonahbauer.raytracing.scene.hittable3d;
 
 import eu.jonahbauer.raytracing.math.Range;
 import eu.jonahbauer.raytracing.math.Ray;
 import eu.jonahbauer.raytracing.math.Vec3;
+import eu.jonahbauer.raytracing.render.Color;
+import eu.jonahbauer.raytracing.render.material.LambertianMaterial;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -13,7 +15,7 @@ class SphereTest {
     void hit() {
         var center = new Vec3(1, 2, 3);
         var radius = 5;
-        var sphere = new Sphere(center, radius);
+        var sphere = new Sphere(center, radius, new LambertianMaterial(Color.WHITE));
 
         var origin = new Vec3(6, 7, 8);
         var direction = new Vec3(-1, -1, -1);