--- a/src/ldt/README Mon Nov 05 18:46:29 2012 +0100
+++ b/src/ldt/README Mon Nov 05 18:48:47 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
--- a/src/ldt/ldt/ldt_utils/tests/content_tests.py Mon Nov 05 18:46:29 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/content_tests.py Mon Nov 05 18:48:47 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
--- a/src/ldt/ldt/ldt_utils/tests/ldt_tests.py Mon Nov 05 18:46:29 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/ldt_tests.py Mon Nov 05 18:48:47 2012 +0100
@@ -33,7 +33,7 @@
self.LU = LdtUtils()
self.project = Project(title="titleproj1", owner=self.user)
self.project.ldt = '<iri ldtversion="1.0.3" xmlns:dc="http://dublincore.org/documents/dcmi-namespace/"><project id="af3b99e4-b695-11df-bfde-00145ea4a2be" user="admin" title="CA:reponse a TC" abstract=""/> <medias> <media extra="" id="laurentcantet_entrelesmurs" pict="" src="http://amateur.iri.centrepompidou.fr//atelier/static/media/ldt/laurentcantet_entrelesmurs/laurentcantet_entrelesmurs.iri" video="rtmp://media.iri.centrepompidou.fr/ddc_player/video/regardssignes/"/> </medias> <annotations> <content id="laurentcantet_entrelesmurs"> <ensemble id="ens_perso" idProject="fe0d5d4c-2201-11df-8a24-00145ea4a2be" title="Decoupages personnels" author="perso" abstract=""> <decoupage id="c_EFC3FFE7-0204-A086-EBEC-D2A03A0E56CB" author="perso"> <title>CA: prof et admin</title> <abstract/> <elements> <element id="s_442AAB3A-42DA-F9BF-75E7-D2A0663FD5FF" begin="985690" dur="373222" author="" date="2010/09/02" color="16711680" src=""> <title/> <abstract/> <audio source=""/> <tags/> </element> <element id="s_0050F043-3AD2-0A7C-6699-D2A03A1EBA02" begin="5052858" dur="124407" author="" date="2010/09/02" color="10053375" src=""> <title>conseil de classe</title> <abstract>Reprise de la figure precedente</abstract> <audio source="undefined"/> <tags/> </element> </elements> </decoupage> <decoupage id="c_EEEF5C29-86E1-4AAE-E068-04EB5B00E492" author="perso"> <title>TC: prof et admin</title> <abstract/> <elements> <element id="s_880D9D4B-8BC0-BA43-5ECA-04EBA9FC9E59" begin="2426894" dur="141478" author="" date="2010/02/25" color="10053375" src=""> <title>Conseil de classe</title> <abstract/> <audio source=""/> <tags> <tag>Argumentation</tag> </tags> </element> <element id="s_D568A57C-7110-DED2-3165-04EC54387060" begin="5052858" dur="124407" author="" date="2010/02/25" color="10053375" src=""> <title>conseil de classe</title> <abstract>Reprise de la figure precedente</abstract> <audio source="undefined"/> <tags/> </element> </elements> </decoupage> </ensemble> </content> </annotations> <displays> <display id="0" title="Init view" idsel="laurentcantet_entrelesmurs" tc="2426424" zoom="0" scroll="0" infoBAB=""> <audio source=""/> <content id="laurentcantet_entrelesmurs"> <decoupage idens="en_2" id="de_PPP" tagsSelect=""/> <decoupage idens="laurentcantet_entrelesmurs" id="c_14A2E638-1936-97DC-E303-2DBA6A82A8B3" tagsSelect=""/> <decoupage idens="ens_perso" id="c_EEEF5C29-86E1-4AAE-E068-04EB5B00E492" tagsSelect=""/> <decoupage idens="ens_perso" id="c_EFC3FFE7-0204-A086-EBEC-D2A03A0E56CB" tagsSelect=""/> </content> </display> </displays> <edits> <editing id="0" tags=""> <title>Bout a bout 1</title> <abstract/> <edit id="edit1" tags=""> <eList/> <caption/> <audio/> <mList/> </edit> <edit id="edit2" tags=""> <eList/> <caption/> <audio/> <mList/> </edit> </editing> </edits> </iri>'
- 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
--- a/src/ldt/ldt/ldt_utils/tests/media_tests.py Mon Nov 05 18:46:29 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/media_tests.py Mon Nov 05 18:48:47 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
--- a/src/ldt/ldt/ldt_utils/tests/project_tests.py Mon Nov 05 18:46:29 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/tests/project_tests.py Mon Nov 05 18:48:47 2012 +0100
@@ -33,12 +33,11 @@
def test_create_project(self):
self.project2 = Project(title="titleproj2", owner=self.user)
self.project2.ldt = '<iri ldtversion="1.0.3" xmlns:dc="http://dublincore.org/documents/dcmi-namespace/"><project id="af3b99e4-b695-11df-bfde-00145ea4a212" user="admin" title="CA:reponse a TC" abstract=""/> <medias> <media extra="" id="laurentcantet_entrelesmurs" pict="" src="http://amateur.iri.centrepompidou.fr//atelier/static/media/ldt/laurentcantet_entrelesmurs/laurentcantet_entrelesmurs.iri" video="rtmp://media.iri.centrepompidou.fr/ddc_player/video/regardssignes/"/> </medias> <annotations> <content id="laurentcantet_entrelesmurs"> <ensemble id="ens_perso" idProject="fe0d5d4c-2201-11df-8a24-00145ea4a2be" title="Decoupages personnels" author="perso" abstract=""> <decoupage id="c_EFC3FFE7-0204-A086-EBEC-D2A03A0E56CB" author="perso"> <title>CA: prof et admin</title> <abstract/> <elements> <element id="s_442AAB3A-42DA-F9BF-75E7-D2A0663FD5FF" begin="985690" dur="373222" author="" date="2010/09/02" color="16711680" src=""> <title/> <abstract/> <audio source=""/> <tags/> </element> <element id="s_0050F043-3AD2-0A7C-6699-D2A03A1EBA02" begin="5052858" dur="124407" author="" date="2010/09/02" color="10053375" src=""> <title>conseil de classe</title> <abstract>Reprise de la figure precedente</abstract> <audio source="undefined"/> <tags/> </element> </elements> </decoupage> <decoupage id="c_EEEF5C29-86E1-4AAE-E068-04EB5B00E492" author="perso"> <title>TC: prof et admin</title> <abstract/> <elements> <element id="s_880D9D4B-8BC0-BA43-5ECA-04EBA9FC9E59" begin="2426894" dur="141478" author="" date="2010/02/25" color="10053375" src=""> <title>Conseil de classe</title> <abstract/> <audio source=""/> <tags> <tag>Argumentation</tag> </tags> </element> <element id="s_D568A57C-7110-DED2-3165-04EC54387060" begin="5052858" dur="124407" author="" date="2010/02/25" color="10053375" src=""> <title>conseil de classe</title> <abstract>Reprise de la figure precedente</abstract> <audio source="undefined"/> <tags/> </element> </elements> </decoupage> </ensemble> </content> </annotations> <displays> <display id="0" title="Init view" idsel="laurentcantet_entrelesmurs" tc="2426424" zoom="0" scroll="0" infoBAB=""> <audio source=""/> <content id="laurentcantet_entrelesmurs"> <decoupage idens="en_2" id="de_PPP" tagsSelect=""/> <decoupage idens="laurentcantet_entrelesmurs" id="c_14A2E638-1936-97DC-E303-2DBA6A82A8B3" tagsSelect=""/> <decoupage idens="ens_perso" id="c_EEEF5C29-86E1-4AAE-E068-04EB5B00E492" tagsSelect=""/> <decoupage idens="ens_perso" id="c_EFC3FFE7-0204-A086-EBEC-D2A03A0E56CB" tagsSelect=""/> </content> </display> </displays> <edits> <editing id="0" tags=""> <title>Bout a bout 1</title> <abstract/> <edit id="edit1" tags=""> <eList/> <caption/> <audio/> <mList/> </edit> <edit id="edit2" tags=""> <eList/> <caption/> <audio/> <mList/> </edit> </editing> </edits> </iri>'
- 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 = '<iri ldtversion="1.0.3" xmlns:dc="http://dublincore.org/documents/dcmi-namespace/"><project id="af3b99e4-b695-11df-bfde-00145ea4a333" user="admin" title="CA:reponse a TC" abstract=""/> <medias> <media extra="" id="laurentcantet_entrelesmurs" pict="" src="http://amateur.iri.centrepompidou.fr//atelier/static/media/ldt/laurentcantet_entrelesmurs/laurentcantet_entrelesmurs.iri" video="rtmp://media.iri.centrepompidou.fr/ddc_player/video/regardssignes/"/> </medias> <annotations> <content id="laurentcantet_entrelesmurs"> <ensemble id="ens_perso" idProject="fe0d5d4c-2201-11df-8a24-00145ea4a2be" title="Decoupages personnels" author="perso" abstract=""> <decoupage id="c_EFC3FFE7-0204-A086-EBEC-D2A03A0E56CB" author="perso"> <title>CA: prof et admin</title> <abstract/> <elements> <element id="s_442AAB3A-42DA-F9BF-75E7-D2A0663FD5FF" begin="985690" dur="373222" author="" date="2010/09/02" color="16711680" src=""> <title/> <abstract/> <audio source=""/> <tags/> </element> <element id="s_0050F043-3AD2-0A7C-6699-D2A03A1EBA02" begin="5052858" dur="124407" author="" date="2010/09/02" color="10053375" src=""> <title>conseil de classe</title> <abstract>Reprise de la figure precedente</abstract> <audio source="undefined"/> <tags/> </element> </elements> </decoupage> <decoupage id="c_EEEF5C29-86E1-4AAE-E068-04EB5B00E492" author="perso"> <title>TC: prof et admin</title> <abstract/> <elements> <element id="s_880D9D4B-8BC0-BA43-5ECA-04EBA9FC9E59" begin="2426894" dur="141478" author="" date="2010/02/25" color="10053375" src=""> <title>Conseil de classe</title> <abstract/> <audio source=""/> <tags> <tag>Argumentation</tag> </tags> </element> <element id="s_D568A57C-7110-DED2-3165-04EC54387060" begin="5052858" dur="124407" author="" date="2010/02/25" color="10053375" src=""> <title>conseil de classe</title> <abstract>Reprise de la figure precedente</abstract> <audio source="undefined"/> <tags/> </element> </elements> </decoupage> </ensemble> </content> </annotations> <displays> <display id="0" title="Init view" idsel="laurentcantet_entrelesmurs" tc="2426424" zoom="0" scroll="0" infoBAB=""> <audio source=""/> <content id="laurentcantet_entrelesmurs"> <decoupage idens="en_2" id="de_PPP" tagsSelect=""/> <decoupage idens="laurentcantet_entrelesmurs" id="c_14A2E638-1936-97DC-E303-2DBA6A82A8B3" tagsSelect=""/> <decoupage idens="ens_perso" id="c_EEEF5C29-86E1-4AAE-E068-04EB5B00E492" tagsSelect=""/> <decoupage idens="ens_perso" id="c_EFC3FFE7-0204-A086-EBEC-D2A03A0E56CB" tagsSelect=""/> </content> </display> </displays> <edits> <editing id="0" tags=""> <title>Bout a bout 1</title> <abstract/> <edit id="edit1" tags=""> <eList/> <caption/> <audio/> <mList/> </edit> <edit id="edit2" tags=""> <eList/> <caption/> <audio/> <mList/> </edit> </editing> </edits> </iri>'
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