test

src/m/Parking.py

@@ -101,6 +101,18 @@ class Parking:
     def nbSuperAbo(self):
         return Place.nbSuperAbo(self.__id)
 
+    ## propriete : listeTypePlace
+    @property
+    def listeTypePlace(self):
+        c = connexionBDD()
+        r = c.execute("SELECT idTypePlace FROM typePlace WHERE idTypePlace in (SELECT idTypePlace FROM place WHERE idParking = '" + str(self.__id) + "')")
+        rows = r.fetchall()
+        c.seDeconnecter()
+        l = []
+        for row in rows:
+            l.append(TypePlace(row["idTypePlace"]))
+        return l
+
     ## Recherche une place pour une voiture
     # @param voiture voiture pour laquel on recherche la place
     # @return Place Si touvé : Place sinon : None

src/m/Service.py

@@ -21,7 +21,6 @@ class Service:
         l = []
         for row in rows:
             l.append(Service(row["idService"]))
-        print("l = " + str(l))
         return l
 
     ## Retourne tout les services associé a un Placement

src/m/test/TestParking.py

@@ -12,8 +12,8 @@ class TestParking:
     def TestParking(self):
         p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1), TypePlace(None, 200, 130, 5, 2.5, 1)])
         id = p.id
-        assert_equal(p.nbPlacesLibresParking, 9, "Nombre de place libre non valide")
-        assert_equal(p.nbPlaces, 9, "Nombre de place non valide")
+        assert_equal(p.nbPlacesLibresParking, 13, "Nombre de place libre non valide")
+        assert_equal(p.nbPlaces, 13, "Nombre de place non valide")
         assert_equal(p.nbSuperAbo, 0, "Nombre de place super abo")
 
     def TestRecherchePlace(self):
@@ -23,17 +23,20 @@ class TestParking:
         place = p.recherchePlace(v)
         assert_equal(place, None, "Aucune place devrait etre trouve")
 
+        p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1)])
         v = Voiture(None,None,100,300)
         place = p.recherchePlace(v)
         assert_equal(place, None, "Aucune place devrait etre trouve")
 
+        p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1)])
         v = Voiture(None,None,300,100)
         place = p.recherchePlace(v)
         assert_equal(place, None, "Aucune place devrait estre trouve")
 
-        v = Voiture(None,None,100,100)
+        p = Parking(None, "test", [TypePlace(None, 220, 200, 4, 2.5, 1)])
+        v = Voiture(None,None,10,10,"lol")
         place = p.recherchePlace(v)
-        assert_not_equal(place, None, "Une place devrait etre trouve")
+        assert_not_equal(place is None, False, "Une place devrait etre trouve")
 
 ## Test Place
 class TestPlace:

src/m/test/TestService.py

@@ -1,15 +1,49 @@
 """
     Test Module m/Service
 """
+import datetime
+from nose.tools import assert_equal,assert_not_equal
 from src.m.Abonnement import Client, TypeAbonnement
-from src.m.Parking import Placement
-
+from src.m.Parking import Placement, Place, Parking, TypePlace
 from src.m.Service import Service, TypeService
+from src.m.Voiture import Voiture
 
 ## Test des Service
 class TestService:
     ## Test instanciation
     def TestService(self):
-        pass
-        #c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE)
-        #Service(None,c ,Placement(),TypeService.ENTRETIEN)
+        v = Voiture(None, None, 120, 100, "IMMA")
+        t  = TypePlace(None, 220, 200, 4, 2.5, 1)
+        place = Place(None,Parking(None, "test", [t]),t,2)
+        placemnent = Placement(None,v,place)
+        c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE)
+        s = Service(None, c, placemnent, TypeService.ENTRETIEN)
+        assert_equal(s.estRealise, False)
+        assert_equal(s.typeService, TypeService.ENTRETIEN)
+        assert_equal(s.placement,placemnent)
+
+    def TestModifService(self):
+        v = Voiture(None, None, 120, 100, "IMMA")
+        t  = TypePlace(None, 220, 200, 4, 2.5, 1)
+        place = Place(None,Parking(None, "test", [t]),t,2)
+        placemnent = Placement(None,v,place)
+        c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE)
+        s = Service(None, c, placemnent, TypeService.LIVRAISON, datetime.time(),"Miraol")
+
+        time = datetime.time()
+        s.maj(time,"autre")
+        assert_equal(s.lieu,"autre")
+        assert_equal(s.dateService,time)
+
+    def TestDoService(self):
+        v = Voiture(None, None, 120, 100, "IMMA")
+        t  = TypePlace(None, 220, 200, 4, 2.5, 1)
+        place = Place(None,Parking(None, "test", [t]),t,2)
+        placemnent = Placement(None,v,place)
+        c = Client(None,"Jean","Paul","1225233",TypeAbonnement.ABONNE)
+        s = Service(None, c, placemnent, TypeService.LIVRAISON, datetime.time(),"Miraol")
+        assert_equal(s.estRealise, False)
+        s.doService()
+        assert_equal(s.estRealise, True)
+
+