From 7e055c6eaf4291539c77932b29b8db0cc42c5d8c Mon Sep 17 00:00:00 2001
From: jwansek <eddie.atten.ea29@gmail.com>
Date: Thu, 20 Jan 2022 18:51:27 +0000
Subject: started work on templating

---
 ExampleAssessments/CMP-4009B.yml | 40 +++++++++++++++++++--
 ExampleAssessments/example.yml   | 75 ++++++++++++++++++++--------------------
 2 files changed, 75 insertions(+), 40 deletions(-)

(limited to 'ExampleAssessments')

diff --git a/ExampleAssessments/CMP-4009B.yml b/ExampleAssessments/CMP-4009B.yml
index fbadc90..c01979b 100644
--- a/ExampleAssessments/CMP-4009B.yml
+++ b/ExampleAssessments/CMP-4009B.yml
@@ -1,4 +1,4 @@
-assessment_name: CMP-4009B
+name: CMP-4009B
 files:
     - pjtool.py:
         classes:
@@ -19,8 +19,42 @@ files:
                 d1 = pjtool.Date(2001, 8, 12)
                 d2 = pjtool.Date(1999, 4, 5)
                 assert d1 != d2
+            - |
+                d1 = pjtool.Date(2001, 8, 12)
+                d2 = pjtool.Date(1999, 4, 5)
+                assert d1 > d2
+            - |
+                import random
+                d1 = pjtool.Date(random.randint(2000, 2050), 8, 12)
+                d2 = pjtool.Date(random.randint(1900, 2050), 4, 5)
+                assert d1.numYears(d2) == abs(d1.year - d2.year)
+            - |
+                d1 = pjtool.Date(2020, 5, 1)
+                d2 = pjtool.Date(2020, 6, 1)
+                assert d1.numMonths(d2) == 0
+            - |
+                d1 = pjtool.Date(2020, 5, 1)
+                d2 = pjtool.Date(2020, 8, 1)
+                assert d1.numMonths(d2) == 2
     - tester.py:
         functions:
             - dateTester(2)
-dependencies:
-    - matplotlib
\ No newline at end of file
+    - turbine.py:
+        classes:
+            - Turbine:
+                methods:
+                    - __init__(5)
+                    - __str__(1)
+                    - numYearsInst(2)
+                    - serviceDue(2)
+                    - serviceAt(2)
+                    - powerAt(2)
+            - AdvTurbine:
+                methods:
+                    - __init__(5)
+                    - __str__(1)
+                    - numYearsInst(2)
+                    - serviceDue(2)
+                    - serviceAt(2)
+                    - powerAt(2)
+                
diff --git a/ExampleAssessments/example.yml b/ExampleAssessments/example.yml
index 17ab9b0..46cab56 100644
--- a/ExampleAssessments/example.yml
+++ b/ExampleAssessments/example.yml
@@ -1,38 +1,39 @@
-files:
-    - example.py:
-        classes:
-            - Application:
-                methods:
-                    - __init__(3)
-                    - a_method_with_defaults(3)
-                    - add(3)
-                    - aMethodThatIsntThere(1)
-        functions:
-            - hello_world(2)
-            - an_undocumented_function(0)
-            - aFunctionThatIsntThere(2)
-            - greet(2)
-        tests:
-            - |
-                dateOne = example.MyDate(day = 12, month = 8, year = 2001)
-                dateTwo = example.MyDate(day = 12, month = 8, year = 2001)
-                assert dateOne == dateTwo
-            - |
-                dateOne = example.MyDate(day = 12, month = 8, year = 2001)
-                dateTwo = example.MyDate(day = 5, month = 4, year = 1999)
-                assert dateOne == dateTwo
-    - aFileThatIsntThere.py:
-        functions:
-            - hello_world(2)
-    - animals.py:
-        classes:
-            - Dog:
-            - Cat:
-            - Kitten:
-        tests:
-            - |
-                nibbles = animals.Kitten()
-                assert nibbles.speak() == "nyaa~~"
-            - |
-                milton = animals.Dog()
+name: CMP-5021B-19-20
+files:
+    - example.py:
+        classes:
+            - Application:
+                methods:
+                    - __init__(3)
+                    - a_method_with_defaults(3)
+                    - add(3)
+                    - aMethodThatIsntThere(1)
+        functions:
+            - hello_world(2)
+            - an_undocumented_function(0)
+            - aFunctionThatIsntThere(2)
+            - greet(2)
+        tests:
+            - |
+                dateOne = example.MyDate(day = 12, month = 8, year = 2001)
+                dateTwo = example.MyDate(day = 12, month = 8, year = 2001)
+                assert dateOne == dateTwo
+            - |
+                dateOne = example.MyDate(day = 12, month = 8, year = 2001)
+                dateTwo = example.MyDate(day = 5, month = 4, year = 1999)
+                assert dateOne == dateTwo
+    - aFileThatIsntThere.py:
+        functions:
+            - hello_world(2)
+    - animals.py:
+        classes:
+            - Dog:
+            - Cat:
+            - Kitten:
+        tests:
+            - |
+                nibbles = animals.Kitten()
+                assert nibbles.speak() == "nyaa~~"
+            - |
+                milton = animals.Dog()
                 assert milton.move() == "*moves*"
\ No newline at end of file
-- 
cgit v1.2.3