From afd09e77ac8b6a03e345415744cf2e0c219c704c Mon Sep 17 00:00:00 2001
From: DIDIer5454 <menene12.akoo@gmail.com>
Date: Tue, 24 Jan 2023 15:52:37 +0100
Subject: [PATCH] test corrige
---
src/main/java/fr/nancy/iut/Sphere.java | 1 +
src/test/java/fr/nancy/iut/SphereTest.java | 51 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/src/main/java/fr/nancy/iut/Sphere.java b/src/main/java/fr/nancy/iut/Sphere.java
index 8aea1c1..48395a9 100644
--- a/src/main/java/fr/nancy/iut/Sphere.java
+++ b/src/main/java/fr/nancy/iut/Sphere.java
@@ -35,6 +35,7 @@ public class Sphere {
return pos_.distance(other.pos_);
}
+ //Methode renvoyant la distance au carre entre 2 spheres
public double distanceSquaredTo(Sphere other) {
return pos_.distanceSquared(other.pos_);
}
diff --git a/src/test/java/fr/nancy/iut/SphereTest.java b/src/test/java/fr/nancy/iut/SphereTest.java
index 3342054..7fdf7da 100644
--- a/src/test/java/fr/nancy/iut/SphereTest.java
+++ b/src/test/java/fr/nancy/iut/SphereTest.java
@@ -13,5 +13,56 @@ public class SphereTest {
Sphere mySphere = new Sphere(1.5);
assertEquals(14.137166941154069, mySphere.computeVolume(), 0.0);
}
+ @Test
+ public void testDistancesquareTo(){
+ Sphere un=new Sphere(1.5,new Point3d(new double[]{0,0,3}));
+ Sphere deux=new Sphere(1.5,new Point3d(new double[]{2,1,0}));
+ assertEquals(14,un.distanceSquaredTo(deux));
+ }
+ @Test
+ public void test_inContactWith(){
+ Sphere un=new Sphere(1.5,new Point3d(new double[]{0,0,3}));
+ Sphere deux=new Sphere(1.5,new Point3d(new double[]{2,1,0}));
+ Sphere trois=new Sphere(4,new Point3d(new double[]{0,0,3}));
+ assertFalse(un.inContactWith(deux));
+ assertTrue(trois.inContactWith(deux));
+ assertTrue(un.inContactWith(trois));
+ }
+ @Test
+ public void testGetPos(){
+ Sphere mySphere = new Sphere(1.5);
+ assertEquals(new Point3d(new double[]{0,0,0}),mySphere.getPos());
+ }
+ @Test
+ public void testgetRadius(){
+ Sphere deux=new Sphere(1.5,new Point3d(new double[]{2,1,0}));
+ Sphere trois=new Sphere(4,new Point3d(new double[]{0,0,3}));
+ assertEquals(1.5,deux.getRadius());
+ }
+ @Test
+ public void testDistanceTo(){
+ Sphere deux=new Sphere(1.5,new Point3d(new double[]{2,1,0}));
+ Sphere trois=new Sphere(4,new Point3d(new double[]{0,0,3}));
+ assertEquals(Math.sqrt(14.0),deux.distanceTo(trois));
+ }
+ @Test
+ public void TestConstructeurParam(){
+ Sphere deux=new Sphere(1.5,new Point3d(new double[]{2,1,0}));
+ Sphere trois=new Sphere(4,new Point3d());
+ Sphere un=new Sphere(8);
+ assertEquals(new Point3d(new double[]{0,0,0}),un.getPos());
+ assertEquals(8,un.getRadius());
+ assertEquals(4,trois.getRadius());
+ assertEquals(new Point3d(new double[]{0,0,0}),trois.getPos());
+ assertEquals(new Point3d(new double[]{2,1,0}),deux.getPos());
+ assertEquals(1.5,deux.getRadius());
+
+ }
+ @Test
+ public void ConstructeurSansParam(){
+ Sphere quatre =new Sphere();
+ //assertEquals(new Point3d(), quatre.getPos());
+ assertEquals(0.0, quatre.getRadius(),0.0);
+ }
}
\ No newline at end of file
--
GitLab