Changeset 9385 for extensions/jiwigo/trunk/src/test

Timestamp:

Feb 26, 2011, 5:26:27 PM (14 years ago)

Author:

mlg

Message:

All services have been removed from this project to be integrated in a new project : jiwigo-ws-api (not yet on the svn).
The current project now uses jiwigo-ws-api as a maven dependency (explanations can be found here : ​http://www.jiwigo.com/api.html )

Location:

extensions/jiwigo/trunk

Files:

• . (modified) (1 prop)
• src/test/java/fr/mael/jiwigo/service/CategoryServiceTest.java (modified) (3 diffs)
• src/test/java/fr/mael/jiwigo/service/ServicesTest.java (modified) (3 diffs)
• src/test/java/fr/mael/jiwigo/service/TagServiceTest.java (modified) (3 diffs)

extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/CategoryServiceTest.java

@@ -8 +8 @@
 import org.junit.Test;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.TestBase;
 import fr.mael.jiwigo.dao.CategoryDao;
@@ -22 +23 @@
     public void ListerTest() {
         try {
-            CategoryDao.getInstance().lister(true);
-            CategoryDao.getInstance().lister(false);
+            CategoryDao.getInstance(Main.sessionManager).lister(true);
+            CategoryDao.getInstance(Main.sessionManager).lister(false);
         } catch (IOException e) {
             e.printStackTrace();
@@ -35 +36 @@
     public void creerTest() {
         Date date = new Date();
-        Assert.assertSame(true, CategoryService.getInstance().creer("Category" + date.getTime()));
+        Assert.assertSame(true, CategoryService.getInstance(Main.sessionManager).creer("Category" + date.getTime()));
     }
 

extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/ServicesTest.java

@@ -5 +5 @@
 import org.junit.Test;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.TestBase;
 import fr.mael.jiwigo.om.Category;
@@ -18 +19 @@
     public void testCreer() throws Exception {
         Category cat = null;
-        for (Category category : CategoryService.getInstance().lister(true)) {
+        for (Category category : CategoryService.getInstance(Main.sessionManager).lister(true)) {
             if (category.getIdentifiant().equals(3)) {
                 cat = category;
@@ -24 +25 @@
             }
         }
-        Image image = ImageService.getInstance().listerParCategory(cat.getIdentifiant(), true).get(0);
-        int firstCount = CommentService.getInstance().lister(image.getIdentifiant()).size();
-        CommentService.getInstance().creer("comment test", image.getIdentifiant(), "none");
-        Assert.assertSame(firstCount + 1, CommentService.getInstance().lister(image.getIdentifiant()).size());
+        Image image = ImageService.getInstance(Main.sessionManager).listerParCategory(cat.getIdentifiant(), true)
+                .get(0);
+        int firstCount = CommentService.getInstance(Main.sessionManager).lister(image.getIdentifiant()).size();
+        CommentService.getInstance(Main.sessionManager).creer("comment test", image.getIdentifiant(), "none");
+        Assert.assertSame(firstCount + 1, CommentService.getInstance(Main.sessionManager)
+                .lister(image.getIdentifiant()).size());
     }
 }

extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/TagServiceTest.java

@@ -8 +8 @@
 import org.junit.Test;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.TestBase;
 import fr.mael.jiwigo.dao.TagDao;
@@ -23 +24 @@
     public void ListerTest() {
         try {
-            TagDao.getInstance().lister();
+            TagDao.getInstance(Main.sessionManager).lister();
         } catch (IOException e) {
             e.printStackTrace();
@@ -36 +37 @@
         Date date = new Date();
         try {
-            Assert.assertSame(true, TagService.getInstance().creer("Tag" + date.getTime()));
+            Assert.assertSame(true, TagService.getInstance(Main.sessionManager).creer("Tag" + date.getTime()));
         } catch (IOException e) {
             // TODO Auto-generated catch block