From a2283bf38123317a892fd851efdc66737b7b73ba Mon Sep 17 00:00:00 2001
From: haribo <haribo@haribo-pc>
Date: Fri, 20 May 2016 14:50:57 +0200
Subject: [PATCH] Date: 20/05/2016 By: Paul Carensac Version: 0.4.2 	

---
 README.md              | 12 ++++++++++++
 src/scheduler/tests.py | 12 ++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 0c35da3..2596f85 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,14 @@ PROJECT STRUCTURE:
 
 CURRENT VERSION
 
+Date: 20/05/2016
+By: Paul Carensac
+Version: 0.4.2	
+Ajout de la simulation aux tests du scheduler
+(Attention: DB changed)
+Issue (closed): https://projects.irap.omp.eu/issues/3701
+Major current version (0.4): https://projects.irap.omp.eu/versions/90
+
 Date: 19/05/2016
 By: Paul Carensac
 Version: 0.4.1	
@@ -87,6 +95,10 @@ MAIN CHANGES (MILESTONES):
 
 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
 
+20/05/16	Version 0.4.2 - Final version 0.4
+			Complete scheduler update
+			https://projects.irap.omp.eu/versions/90
+
 10/05/16	Version 0.3.12 - Final version 0.3
 			Complete workflow skeleton
 			https://projects.irap.omp.eu/versions/88
diff --git a/src/scheduler/tests.py b/src/scheduler/tests.py
index 64d7101..a3aced1 100644
--- a/src/scheduler/tests.py
+++ b/src/scheduler/tests.py
@@ -2,7 +2,9 @@ from django.test import TestCase
 from scheduler.models import Scheduler
 from pyrosapp.models import *
 from django.contrib.auth.models import User
+from scheduler.simulator import Simulator
 
+SIMULATION_FILE = 'file:./scheduler/sequences_cador.html'
 
 class SchedulerTest(TestCase):
 
@@ -640,3 +642,13 @@ class SchedulerTest(TestCase):
         self.assertEqual(seq2.status, Sequence.INVALID)
         self.assertEqual(seq3.status, Sequence.INVALID)
         self.assertEqual(seq4.status, Sequence.INVALID)
+
+    def test_simulation(self):
+        '''
+            goal : Uses the simulation module to make a schedule and test the validity of created sequences
+        '''
+
+        print("\n===== TEST_SIMULATION =====\n")
+
+        simulator = Simulator()
+        simulator.simulate(SIMULATION_FILE)
--
libgit2 0.21.2