From 35580a070095be6a623742e88b27162149379092 Mon Sep 17 00:00:00 2001
From: HeshamTB <hishaminv@gmail.com>
Date: Fri, 27 Nov 2020 01:07:22 +0300
Subject: [PATCH] Update tests to work with new constructors

Signed-off-by: HeshamTB <hishaminv@gmail.com>
---
 tests/CampaignTest.java | 30 +++++++++++-------------------
 tests/StreetTest.java   |  2 +-
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/tests/CampaignTest.java b/tests/CampaignTest.java
index 6e05d70..702a956 100644
--- a/tests/CampaignTest.java
+++ b/tests/CampaignTest.java
@@ -22,41 +22,33 @@ public class CampaignTest {
         assertSame(oldVehicles, campaign.getVehicles());
         ArrayList<Vehicle> newVehicles = new ArrayList<>();
         for (int i = 0; i < 150; i++) {
-            newVehicles.add(new Bus(5));
+            newVehicles.add(new Bus());
         }
         campaign.setVehicles(newVehicles);
         assertNotSame(oldVehicles, newVehicles);
         assertSame(campaign.getVehicles(), newVehicles);
     }
 
-    @Test
-    void GenerateBussesToSameValAsParam() {
-        campaign.generateBusses(50);
-        assertEquals(campaign.getVehicles().size(), 50);
-    }
-
     @Test
     void ConstructorWithNumberOfBusses() {
         campaign = new Campaign(District.ALAZIZIYA, 60);
         assertNotNull(campaign.getVehicles());
 
         ArrayList<Vehicle> list = new ArrayList<>();
-        list.add(new Bus(5));
-        list.add(new Bus(7));
+        list.add(new Bus());
+        list.add(new Bus());
         campaign = new Campaign(District.ALAZIZIYA, list);
         assertNotNull(campaign.getVehicles());
+        assertEquals(campaign.getVehicles().size(), 2);
     }
 
-    /*
-    This test depends on order of tests in this file.
-    It tests a var related to a static member.
-    The Junit way is to run setUp() for every test case;
-    thus, making the static car count up to how many times
-    the object is constructed.
-     */
     @Test
-    void UID_AsExpected(){
-        String uid = campaign.getUID();
-        assertTrue(campaign.getUID().matches("CAMP0006"));
+    void setRouteSetsSameForAllVehicles() {
+        Route r = new Route(new Street[]{new Street(200, 3, StreetNames.FOURTH_HIGHWAY1),
+        new Street(500,2,StreetNames.FOURTH_HIGHWAY3)},District.ALMANSOOR, Mashier.ARAFAT);
+        campaign.setRoute(r);
+        assertSame(campaign.getVehicles().get(5).getRoute(), r);
+        assertSame(campaign.getVehicles().get(0).getRoute(), r);
+        assertSame(campaign.getVehicles().get(22).getRoute(), r);
     }
 }
diff --git a/tests/StreetTest.java b/tests/StreetTest.java
index b430658..5f65e36 100644
--- a/tests/StreetTest.java
+++ b/tests/StreetTest.java
@@ -15,7 +15,7 @@ class StreetTest {
 
     @BeforeEach
     void setUp() {
-        street = new Street(length, lanes);
+        street = new Street(length, lanes,StreetNames.FOURTH_HIGHWAY1);
     }
 
     @Test