# HG changeset patch
# User rougeronj
# Date 1352128579 -3600
# Node ID 77d216688495e4ce442401352310bb932f50fbdc
# Parent 6ac668113c40a2c16d80521d722c20969bbe8907
Unit test Update
diff -r 6ac668113c40 -r 77d216688495 src/ldt/README
--- a/src/ldt/README Mon Nov 05 15:20:11 2012 +0100
+++ b/src/ldt/README Mon Nov 05 16:16:19 2012 +0100
@@ -5,7 +5,6 @@
The ldt platform, is a django module allowing the annotation, indexation, consultation of temporal content (audio, video)
-
trick:
compile messages for js
python ../../../web/ldtplatform/manage.py makemessages -a -d djangojs
@@ -62,3 +61,16 @@
swfobject.js
ZeroClipboard
tiny_mce
+
+
+==============
+Unit Test
+==============
+
+In a terminal :
+ python manage.py test %test_api%
+Will launch all the tests of the api
+
+For example :
+ python manage.py test ldt_utils
+Will launch all the test defined in /ldt_utils/tests
\ No newline at end of file
diff -r 6ac668113c40 -r 77d216688495 src/ldt/ldt/ldt_utils/tests/content_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/content_tests.py Mon Nov 05 15:20:11 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/content_tests.py Mon Nov 05 16:16:19 2012 +0100
@@ -57,7 +57,8 @@
self.cont14.delete()
self.cont14.commit()
- self.assertIsNone(Content.objects.get(iri_id=self.cont14.iri_id))
+ with self.assertRaises(Content.DoesNotExist):
+ Content.objects.get(iri_id=self.cont14.iri_id)
#test the deletion of a content with media
def test_del_content_v2(self):
@@ -69,5 +70,6 @@
self.cont15.delete()
self.cont15.commit()
- self.assertIsNone(Content.objects.get(iri_id=self.cont15.iri_id))
+ with self.assertRaises(Content.DoesNotExist):
+ Content.objects.get(iri_id=self.cont15.iri_id)
\ No newline at end of file
diff -r 6ac668113c40 -r 77d216688495 src/ldt/ldt/ldt_utils/tests/ldt_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/ldt_tests.py Mon Nov 05 15:20:11 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/ldt_tests.py Mon Nov 05 16:16:19 2012 +0100
@@ -33,7 +33,7 @@
self.LU = LdtUtils()
self.project = Project(title="titleproj1", owner=self.user)
self.project.ldt = 'CA: prof et adminconseil de classeReprise de la figure precedenteTC: prof et adminConseil de classeArgumentationconseil de classeReprise de la figure precedenteBout a bout 1
'
- self.project.id = "11231"
+ self.project.id = "11321"
self.project.ldt_id = str(uuid.uuid1())
self.project.description = "proj1description"
self.project.save()
@@ -148,9 +148,9 @@
self.project.contents.add(self.cont11)
self.project.ldt = ""
create_ldt(self.project, self.user)
-
+
self.LA = LdtAnnotation(self.project)
-
+
self.LA.add("id11", "cutting_id", "cutting_title", "title", "text", ["tag1", "tag2"], "800",
"10000", "jdoe", "2011-09-10T09:12:58")
self.LA.save()
@@ -162,3 +162,4 @@
self.assertEqual(ann.get("author"), "jdoe")
self.assertEqual(title, "title")
self.assertEqual(abstract, "text")
+
\ No newline at end of file
diff -r 6ac668113c40 -r 77d216688495 src/ldt/ldt/ldt_utils/tests/media_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/media_tests.py Mon Nov 05 15:20:11 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/media_tests.py Mon Nov 05 16:16:19 2012 +0100
@@ -11,6 +11,7 @@
from ldt.ldt_utils.models import User, Project, Content, Media
from ldt.ldt_utils.utils import LdtUtils, LdtAnnotation, create_ldt, create_empty_iri, copy_ldt
from ldt.test.client import Client
+from django.core.exceptions import ObjectDoesNotExist
import lxml.etree
import tempfile
import unittest
@@ -31,7 +32,7 @@
self.user.username = 'blop'
def test_create_media(self):
- self.media1 = Media()
+ self.media1, created = Media.objects.get_or_create(src = "http://www.youtube.com/watch?v=O2G-PEtyKSY")
self.media1.id = 1
self.media1.save()
@@ -44,4 +45,6 @@
self.media2.delete()
- self.assertIsNone(Media.objects.get(id=self.media2.id))
\ No newline at end of file
+ with self.assertRaises(Media.DoesNotExist):
+ Media.objects.get(id=self.media2.id)
+
\ No newline at end of file
diff -r 6ac668113c40 -r 77d216688495 src/ldt/ldt/ldt_utils/tests/project_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/project_tests.py Mon Nov 05 15:20:11 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/project_tests.py Mon Nov 05 16:16:19 2012 +0100
@@ -33,12 +33,11 @@
def test_create_project(self):
self.project2 = Project(title="titleproj2", owner=self.user)
self.project2.ldt = 'CA: prof et adminconseil de classeReprise de la figure precedenteTC: prof et adminConseil de classeArgumentationconseil de classeReprise de la figure precedenteBout a bout 1
'
- self.project2.id = "222"
self.project2.ldt_id = str(uuid.uuid1())
self.project2.description = "proj2description"
self.project2.save()
- self.assertIs(Project.objects.get(id=self.project2.id), self.project2)
+ self.assertEqual(Project.objects.get(ldt_id=self.project2.ldt_id), self.project2)
#test deletion of project without annotation
def test_del_project_v1(self):
@@ -46,10 +45,11 @@
self.project3.ldt = 'CA: prof et adminconseil de classeReprise de la figure precedenteTC: prof et adminConseil de classeArgumentationconseil de classeReprise de la figure precedenteBout a bout 1
'
self.project3.id = "333"
self.project3.ldt_id = str(uuid.uuid1())
- self.project3.description = "proj2description"
+ self.project3.description = "proj3description"
self.project3.save()
self.project3.delete()
- self.assertIsNone(Project.objects.get(ldt_id=self.project3.ldt_id))
+ with self.assertRaises(Project.DoesNotExist):
+ Project.objects.get(ldt_id=self.project3.ldt_id)
\ No newline at end of file