# HG changeset patch
# User rougeronj
# Date 1351593025 -3600
# Node ID 31770c3f29faa1b2b8c23e0a1ea8c7e801a0af0f
# Parent 1d071843f134c2dce35bbbf847bbaca64d45dee7
Unit test
diff -r 1d071843f134 -r 31770c3f29fa src/ldt/ldt/ldt_utils/tests/content_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/content_tests.py Thu Oct 25 11:43:01 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/tests/content_tests.py Tue Oct 30 11:30:25 2012 +0100
@@ -30,30 +30,44 @@
self.user = User()
self.user.username = 'blop'
- def test_create_content(self):
+ #test the creation of a content without media
+ def test_create_content_v1(self):
self.cont12 = Content(iriurl="id12/iriurl12", duration = 100)
self.cont12.iri_id = "id112"
self.cont12.save()
self.assertEqual(Content.objects.get(iri_id=self.cont12.iri_id), self.cont12)
- def test_del_content(self):
+ #test the creation of a content with a media
+ def test_create_content_v2(self):
+ self.media13 = Media()
+ self.cont13 = Content(iriurl="id13/iriurl13", duration = 100, media_obj = self.media13)
self.cont13 = Content(iriurl="id13/iriurl13", duration = 100)
self.cont13.iri_id = "id113"
self.cont13.save()
- self.cont13.delete()
- self.cont13.commit()
- #self.assertEqual(Content.objects.get(iri_id=self.cont13.iri_id), None)
-
+ self.assertEqual(Content.objects.get(iri_id=self.cont13.iri_id), self.cont13)
+
+ #test the deletion of a content without media
+ def test_del_content_v1(self):
+ self.cont14 = Content(iriurl="id14/iriurl14", duration = 100)
+ self.cont14.iri_id = "id114"
+ self.cont14.save()
+
+ self.cont14.delete()
+ self.cont14.commit()
-"""
- self.project.contents.add(self.cont5, self.cont6)
- self.project.ldt = ""
- create_ldt(self.project, self.user)
- ldt = lxml.etree.fromstring(self.project.ldt_encoded)
- self.assertEqual(ldt.xpath("/iri")[0].tag, "iri")
- self.assertEqual(ldt.xpath("/iri/project")[0].get("title"), self.project.title)
- self.assertEqual(ldt.xpath("/iri/medias/media")[0].get("src"), self.cont5.iri_url())
- self.assertEqual(ldt.xpath("/iri/medias/media")[1].get("id"), self.cont6.iri_id)
-"""
+ self.assertIsNone(Content.objects.get(iri_id=self.cont14.iri_id))
+
+ #test the deletion of a content with media
+ def test_del_content_v2(self):
+ self.media15 = Media()
+ self.cont15 = Content(iriurl="id15/iriurl15", duration = 100, media_obj = self.media15)
+ self.cont15.iri_id = "id115"
+ self.cont15.save()
+
+ self.cont15.delete()
+ self.cont15.commit()
+
+ self.assertIsNone(Content.objects.get(iri_id=self.cont15.iri_id))
+
\ No newline at end of file
diff -r 1d071843f134 -r 31770c3f29fa src/ldt/ldt/ldt_utils/tests/media_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/media_tests.py Thu Oct 25 11:43:01 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/tests/media_tests.py Tue Oct 30 11:30:25 2012 +0100
@@ -44,4 +44,4 @@
self.media2.delete()
- #self.assertEqual(Media.objects.get(id=self.media2.id), None)
\ No newline at end of file
+ self.assertIsNone(Media.objects.get(id=self.media2.id))
\ No newline at end of file
diff -r 1d071843f134 -r 31770c3f29fa src/ldt/ldt/ldt_utils/tests/project_tests.py
--- a/src/ldt/ldt/ldt_utils/tests/project_tests.py Thu Oct 25 11:43:01 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/tests/project_tests.py Tue Oct 30 11:30:25 2012 +0100
@@ -31,9 +31,25 @@
self.user.username = 'blop'
def test_create_project(self):
- 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 = "111"
- self.project.ldt_id = str(uuid.uuid1())
- self.project.description = "proj1description"
- self.project.save()
\ No newline at end of file
+ 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)
+
+ #test deletion of project without annotation
+ def test_del_project_v1(self):
+ self.project3 = Project(title="titleproj3", owner=self.user)
+ 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.save()
+
+ self.project3.delete()
+
+ self.assertIsNone(Project.objects.get(ldt_id=self.project3.ldt_id))
+
\ No newline at end of file
diff -r 1d071843f134 -r 31770c3f29fa src/ldt/ldt/ldt_utils/tests/tests.py
--- a/src/ldt/ldt/ldt_utils/tests/tests.py Thu Oct 25 11:43:01 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from ldt.test.testcases import OAuthTestCase, TestCase
-from django.conf import settings
-from django.test import TestCase
-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 WebClient
-import lxml.etree
-import tempfile
-import unittest
-import uuid
-import logging
-
-CONSUMER_KEY = 'dpf43f3p2l4k3l03'
-CONSUMER_SECRET = 'kd94hf93k423kf44'
-
-class UtilsTest(OAuthTestCase):
-
- fixtures = ['base_data.json', 'user_data.json']
-
- def setUp(self):
- logging.disable(logging.CRITICAL)
- self.user = User()
- self.user.username = 'admin'
- #self.set_login_url("/auth_accounts/login/")
- self.set_consumer(CONSUMER_KEY, CONSUMER_SECRET)
- self.client.login(username='admin', password='')
-
- 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