From b770e59d32987c3976d9c41633a853b051651ac4 Mon Sep 17 00:00:00 2001 From: Tom Manderson Date: Tue, 28 Apr 2015 11:10:42 +1000 Subject: [PATCH 1/4] Fixed right angled triangle side ordering for area --- problem_db/inherit_poly.tut/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/problem_db/inherit_poly.tut/tests.py b/problem_db/inherit_poly.tut/tests.py index 833f425..f1c1408 100644 --- a/problem_db/inherit_poly.tut/tests.py +++ b/problem_db/inherit_poly.tut/tests.py @@ -48,7 +48,7 @@ class TestTriangleArea(StudentTestCase): def test_main(self): def _get_results(): - t = RightAngledTriangle([(0, 0), (0, 4), (3, 4)]) + t = RightAngledTriangle([(0, 4), (0, 0), (3, 4)]) return t.area() result = self.run_in_student_context(_get_results) @@ -56,7 +56,7 @@ def _get_results(): def test_alternate(self): def _get_results(): - t = RightAngledTriangle([(0, 0), (0, 5), (12, 5)]) + t = RightAngledTriangle([(0, 5), (0, 0), (12, 5)]) return t.area() result = self.run_in_student_context(_get_results) From 2efd56eb8750a44e621f4056b620762298bdc82a Mon Sep 17 00:00:00 2001 From: Tom Manderson Date: Tue, 28 Apr 2015 11:21:06 +1000 Subject: [PATCH 2/4] Update DESCRIPTION to reflect change --- problem_db/inherit_poly.tut/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/problem_db/inherit_poly.tut/tests.py b/problem_db/inherit_poly.tut/tests.py index f1c1408..489c032 100644 --- a/problem_db/inherit_poly.tut/tests.py +++ b/problem_db/inherit_poly.tut/tests.py @@ -43,7 +43,7 @@ def _get_results(): class TestTriangleArea(StudentTestCase): - DESCRIPTION = 't = RightAngledTriangle([(0, 0), (0, 4), (3, 4)]); t.area() -> 6.' + DESCRIPTION = 't = RightAngledTriangle([(0, 4), (0, 0), (3, 4)]); t.area() -> 6.' MAIN_TEST = 'test_main' def test_main(self): From 8e98f8aab239e3393652d90c3e4b3b9fdc3b69f2 Mon Sep 17 00:00:00 2001 From: Tom Manderson Date: Tue, 28 Apr 2015 11:32:54 +1000 Subject: [PATCH 3/4] Change other tests to match invariant --- problem_db/inherit_poly.tut/tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/problem_db/inherit_poly.tut/tests.py b/problem_db/inherit_poly.tut/tests.py index 489c032..22e27b0 100644 --- a/problem_db/inherit_poly.tut/tests.py +++ b/problem_db/inherit_poly.tut/tests.py @@ -64,25 +64,25 @@ def _get_results(): class TestTriangleVertices(StudentTestCase): - DESCRIPTION = 't = RightAngledTriangle([(0, 0), (0, 4), (3, 4)]); t.vertices() -> [(0, 0), (0, 4), (3, 4)]' + DESCRIPTION = 't = RightAngledTriangle([(0, 4), (0, 0), (3, 4)]); t.vertices() -> [(0, 4), (0, 0), (3, 4)]' MAIN_TEST = 'test_main' def test_main(self): def _get_results(): - t = RightAngledTriangle([(0, 0), (0, 4), (3, 4)]) + t = RightAngledTriangle([(0, 4), (0, 0), (3, 4)]) return t.vertices() result = self.run_in_student_context(_get_results) - expected = [(0, 0), (0, 4), (3, 4)] + expected = [(0, 4), (0, 0), (3, 4)] self.assertEqual(sorted(result), sorted(expected)) def test_alternate(self): def _get_results(): - t = RightAngledTriangle([(0, 0), (0, 5), (12, 5)]) + t = RightAngledTriangle([(0, 5), (0, 0), (12, 5)]) return t.vertices() result = self.run_in_student_context(_get_results) - expected = [(0, 0), (0, 5), (12, 5)] + expected = [(0, 5), (0, 0), (12, 5)] self.assertEqual(sorted(result), sorted(expected)) From 5e00a363a0d2d577719cd81de4567669503bee21 Mon Sep 17 00:00:00 2001 From: Tom Manderson Date: Tue, 28 Apr 2015 11:37:14 +1000 Subject: [PATCH 4/4] Update version --- code/tutorlib/gui/app/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/tutorlib/gui/app/app.py b/code/tutorlib/gui/app/app.py index 22b5a85..2b0f32c 100644 --- a/code/tutorlib/gui/app/app.py +++ b/code/tutorlib/gui/app/app.py @@ -27,7 +27,7 @@ from tutorlib.online.sync import SyncClient -VERSION = '3.0.7' +VERSION = '3.0.8' class TutorialApp(TutorialMenuDelegate, TutorEditorDelegate,