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

Timestamp:

Mar 29, 2011, 8:24:34 PM (14 years ago)

Author:

mlg

Message:

Adds spring for the dependency injection
Deletion of jdom (not useful just for a class that manipulates a simple XML file)

Location:

extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo

Files:

• TestBase.java (modified) (1 diff)
• service/CategoryServiceTest.java (modified) (3 diffs)
• service/ImageServiceBinding.java (added)
• service/ServicesTest.java (modified) (3 diffs)
• service/TagServiceTest.java (modified) (3 diffs)

extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/TestBase.java

@@ -6 +6 @@
 
 import fr.mael.jiwigo.transverse.session.SessionManager;
+import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 
 public class TestBase {
     public TestBase() {
-        Main.sessionManager = new SessionManager("mael", "motdepasse", "http://mael.piwigo.com");
-        if (Main.sessionManager.processLogin() != 0) {
+        SessionManager sessionManager = SpringUtils.getSessionManager();
+        sessionManager.setLogin("mael");
+        sessionManager.setPassword("motdepasse");
+        sessionManager.setUrl("http://mael.piwigo.com/ws.php");
+        if (sessionManager.processLogin() != 0) {
             try {
                 throw new Exception("Connection failed");

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;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
+import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 
 public class CategoryServiceTest extends TestBase {
@@ -25 +24 @@
     public void ListerTest() throws ProxyAuthenticationException {
         try {
-            CategoryDao.getInstance(Main.sessionManager).list(true);
-            CategoryDao.getInstance(Main.sessionManager).list(false);
+            SpringUtils.getCategoryService().list(true);
+            SpringUtils.getCategoryService().list(false);
         } catch (IOException e) {
             e.printStackTrace();
@@ -39 +38 @@
     public void creerTest() throws ProxyAuthenticationException {
         Date date = new Date();
-        Assert.assertSame(true, CategoryService.getInstance(Main.sessionManager).create("Category" + date.getTime()));
+        Assert.assertSame(true, SpringUtils.getCategoryService().create("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;
 import fr.mael.jiwigo.om.Comment;
 import fr.mael.jiwigo.om.Image;
+import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 
 public class ServicesTest extends TestBase {
@@ -20 +20 @@
     public void testCreer() throws Exception {
         Category cat = null;
-        for (Category category : CategoryService.getInstance(Main.sessionManager).list(true)) {
+        for (Category category : SpringUtils.getCategoryService().list(true)) {
             if (category.getIdentifier().equals(3)) {
                 cat = category;
@@ -27 +27 @@
         }
 
-        Image image = ImageService.getInstance(Main.sessionManager).listByCategory(cat.getIdentifier(), true).get(0);
-        List<Comment> comments = CommentService.getInstance(Main.sessionManager).list(image.getIdentifier());
+        Image image = SpringUtils.getImageService().listByCategory(cat.getIdentifier(), true).get(0);
+        List<Comment> comments = SpringUtils.getCommentService().list(image.getIdentifier());
         //      int firstCount = comments.size();
-        CommentService.getInstance(Main.sessionManager).create("comment test", image.getIdentifier(), "none");
+        SpringUtils.getCommentService().create("comment test", image.getIdentifier(), "none");
         //      int secondCount = CommentService.getInstance(Main.sessionManager).list(image.getIdentifier()).size();
         //      Assert.assertSame(firstCount + 1, secondCount);

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;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
+import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 
 public class TagServiceTest extends TestBase {
@@ -26 +25 @@
     public void ListerTest() throws ProxyAuthenticationException {
         try {
-            TagDao.getInstance(Main.sessionManager).list();
+            SpringUtils.getTagService().list();
         } catch (IOException e) {
             e.printStackTrace();
@@ -40 +39 @@
         Date date = new Date();
         try {
-            Assert.assertSame(true, TagService.getInstance(Main.sessionManager).create("Tag" + date.getTime()));
+            Assert.assertSame(true, SpringUtils.getTagService().create("Tag" + date.getTime()));
         } catch (IOException e) {
             // TODO Auto-generated catch block