Changeset 9385 for extensions/jiwigo/trunk

Timestamp:

Feb 26, 2011, 5:26:27 PM (13 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)
• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• logs (modified) (1 prop)
• pom.xml (modified) (3 diffs)
• src/main/java/fr/mael/jiwigo/dao (deleted)
• src/main/java/fr/mael/jiwigo/om (deleted)
• src/main/java/fr/mael/jiwigo/service (deleted)
• src/main/java/fr/mael/jiwigo/transverse/enumeration/CacheEnum.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/enumeration/CategoryEnum.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/enumeration/MethodsEnum.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/enumeration/TagEnum.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/session (deleted)
• src/main/java/fr/mael/jiwigo/transverse/util/ImagesUtil.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/util/MetadataUtil.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/util/Outil.java (deleted)
• src/main/java/fr/mael/jiwigo/ui/comments/CommentsDialog.java (modified) (4 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java (modified) (5 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java (modified) (5 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java (modified) (4 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailSearchPanel.java (modified) (3 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/thread/ThreadPhotoSending.java (modified) (2 diffs)
• src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java (modified) (4 diffs)
• src/main/resources/temp.xml (modified) (1 diff)
• 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/.classpath

@@ -14 +14 @@
   <classpathentry kind="var" path="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jdom/jdom/1.1/jdom-1.1.jar"/>
+  <classpathentry kind="src" path="/jiwigo-ws-api"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>

extensions/jiwigo/trunk/.project

@@ -2 +2 @@
   <name>Jiwigo</name>
   <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
+  <projects>
+    <project>jiwigo-ws-api</project>
+  </projects>
   <buildSpec>
     <buildCommand>

extensions/jiwigo/trunk/pom.xml

@@ -4 +4 @@
   <artifactId>Jiwigo</artifactId>
   <version>0.13</version>
-  
 
-  
+        <repositories>
+                <repository>
+                        <id>mael-repos</id>
+                        <name>Mael Repository</name>
+                        <url>http://maven.le-guevel.com/artifactory/libs-release-local/</url>
+                </repository>
+        </repositories>
+
   <dependencies>
 
-                
+
         <dependency>
             <groupId>org.jdom</groupId>
@@ -49 +55 @@
             <artifactId>filedrop</artifactId>
             <version>1.0</version>
-        </dependency>   
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -60 +66 @@
             <version>1.6.1</version>
         </dependency>
-        
+        <dependency>
+            <groupId>fr.mael.jiwigo</groupId>
+            <artifactId>jiwigo-ws-api</artifactId>
+            <version>0.13</version>
+        </dependency>
+
   </dependencies>
-  
+
   <build>
-<!--    <plugins>-->
-<!--      <plugin>-->
-<!--        <groupId>org.apache.maven.plugins</groupId>-->
-<!--        <artifactId>maven-jar-plugin</artifactId>-->
-<!--        <configuration>-->
-<!--          <archive>-->
-<!--            <manifest>-->
-<!--              <addClasspath>true</addClasspath>-->
-<!--              <mainClass>fr.mael.jiwigo.Main</mainClass>-->
-<!--            </manifest>-->
-<!--          </archive>-->
-<!--        </configuration>-->
-<!--      </plugin>-->
-<!--    </plugins>-->
     <plugins>
       <plugin>

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments/CommentsDialog.java

@@ -52 +52 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
  * dialog that displays the comments of an image and allows to add one
@@ -89 +89 @@
 
     /**
-     * Scrollpane  
+     * Scrollpane
      */
     private JScrollPane scrollPaneArea;
@@ -123 +123 @@
         this.getContentPane().removeAll();
         try {
-            List<Comment> commentsForImage = CommentService.getInstance().lister(imageId);
+            List<Comment> commentsForImage = CommentService.getInstance(Main.sessionManager).lister(imageId);
             GridBagConstraints c = new GridBagConstraints();
             c.insets = new Insets(3, 3, 3, 3);
@@ -167 +167 @@
             boolean reussite = true;
             try {
-                reussite = CommentService.getInstance().creer(text, this.imageId, Main.sessionManager.getLogin());
+                reussite = CommentService.getInstance(Main.sessionManager).creer(text, this.imageId,
+                        Main.sessionManager.getLogin());
             } catch (IOException e) {
                 reussite = false;

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java

@@ -22 +22 @@
 import javax.swing.tree.TreeSelectionModel;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.om.Category;
 import fr.mael.jiwigo.service.CategoryService;
@@ -52 +53 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
  * Arbre des catégories
@@ -133 +134 @@
     /**
      * creation of the nodes
-     * @param root the root 
+     * @param root the root
      */
     private void createNodes(DefaultMutableTreeNode root) {
         DefaultMutableTreeNode category = null;
         try {
-            List<Category> list = CategoryService.getInstance().makeTree();
+            List<Category> list = CategoryService.getInstance(Main.sessionManager).makeTree();
             for (Category cat : list) {
                 if (cat.getCategoriesMeres().size() == 0) {
@@ -228 +229 @@
                 if (selectedCategory != null) {
                     //try to create a category
-                    if (CategoryService.getInstance().creer(nomcategorie, selectedCategory.getIdentifiant())) {
+                    if (CategoryService.getInstance(Main.sessionManager).creer(nomcategorie,
+                            selectedCategory.getIdentifiant())) {
                         setUpUi();
                     } else {
@@ -236 +238 @@
                     }
                 } else {
-                    if (CategoryService.getInstance().creer(nomcategorie)) {
+                    if (CategoryService.getInstance(Main.sessionManager).creer(nomcategorie)) {
                         setUpUi();
                     } else {

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java

@@ -10 +10 @@
 import javax.swing.JPanel;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.om.Category;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.service.ImageService;
 import fr.mael.jiwigo.transverse.ImagesManagement;
+import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
 import fr.mael.jiwigo.transverse.util.Messages;
 import fr.mael.jiwigo.transverse.util.Outil;
 import fr.mael.jiwigo.transverse.util.filedrop.FileDrop;
+import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 import fr.mael.jiwigo.ui.layout.VerticalLayout;
 
@@ -44 +47 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
  * Class that display the thumbnails of a category
@@ -134 +137 @@
         try {
             MainFrame.getInstance().setMessage(Messages.getMessage("thumbviewer_loading"));
-            imagesManagement.setListImage(ImageService.getInstance().listerParCategory(categoryId, rafraichir));
+            imagesManagement.setListImage(ImageService.getInstance(Main.sessionManager).listerParCategory(categoryId,
+                    rafraichir));
             addThumbnails();
             this.repaint();
@@ -155 +159 @@
         JPanel panelh = new JPanel(new FlowLayout());
         try {
-            imagesManagement.setListImage(ImageService.getInstance().listerParCategory(categoryId, false));
+            imagesManagement.setListImage(ImageService.getInstance(Main.sessionManager).listerParCategory(categoryId,
+                    false));
         } catch (IOException e1) {
             e1.printStackTrace();
@@ -229 +234 @@
                 int nbProgressBar = ((i + 1) * 100) / files.length;
                 try {
-
-                    ImageService.getInstance().creer(files[i].getCanonicalPath(), categoryId);
+                    Integer widthOriginal = Integer.valueOf(PreferencesManagement
+                            .getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel()));
+                    Integer heightOriginal = Integer.valueOf(PreferencesManagement
+                            .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel()));
+                    Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE
+                            .getLabel()));
+
+                    ImageService.getInstance(Main.sessionManager).creer(files[i].getCanonicalPath(), categoryId,
+                            widthOriginal, heightOriginal, chunkSize, imagesManagement.getPrivacyLevel());
                     MainFrame.getInstance()
                             .setMessage(files[i].getName() + " " + Messages.getMessage("sendingSuccess"));

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java

@@ -26 +26 @@
 import javax.swing.ListSelectionModel;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.om.Tag;
@@ -60 +61 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
  * Panel that contains the thumbnail of an image
@@ -172 +173 @@
             try {
                 //getting the list of tags
-                List<Tag> tagsDispo = TagService.getInstance().lister();
+                List<Tag> tagsDispo = TagService.getInstance(Main.sessionManager).lister();
                 //list to array (cause fucking JList does not support Lists)
                 Tag[] tableauTagDispo = (Tag[]) tagsDispo.toArray(new Tag[tagsDispo.size()]);
                 //getting the image's tags to preselect them
-                List<Tag> tagsDeLimage = TagService.getInstance().tagsForImage(image);
+                List<Tag> tagsDeLimage = TagService.getInstance(Main.sessionManager).tagsForImage(image);
                 listTags = new JList(tableauTagDispo);
                 //multiple selection is allowed
@@ -220 +221 @@
             tagIds.deleteCharAt(tagIds.lastIndexOf(","));
             try {
-                if (!ImageService.getInstance().addTags(image, tagIds.toString())) {
+                if (!ImageService.getInstance(Main.sessionManager).addTags(image, tagIds.toString())) {
                     JOptionPane.showMessageDialog(this, Messages.getMessage("addingTagsError"), Messages
                             .getMessage("error"), JOptionPane.ERROR_MESSAGE);

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailSearchPanel.java

@@ -6 +6 @@
 import javax.swing.JPanel;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.om.Category;
 import fr.mael.jiwigo.om.Image;
@@ -39 +40 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
  * Classe qui affiche toutes les miniatures d'une catégorie
@@ -89 +90 @@
         try {
             MainFrame.getInstance().setMessage(Messages.getMessage("thumbviewer_loading"));
-            ImagesManagement.getInstance().setListImage(ImageService.getInstance().search(queryString));
+            ImagesManagement.getInstance().setListImage(
+                    ImageService.getInstance(Main.sessionManager).search(queryString));
             for (Image image : ImagesManagement.getInstance().getListImage()) {
                 try {

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/thread/ThreadPhotoSending.java

@@ -5 +5 @@
 import javax.swing.JOptionPane;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.service.ImageService;
+import fr.mael.jiwigo.transverse.ImagesManagement;
+import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
 import fr.mael.jiwigo.transverse.util.Messages;
+import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 import fr.mael.jiwigo.ui.mainframe.MainFrame;
 import fr.mael.jiwigo.ui.mainframe.ThumbnailCategoryPanel;
@@ -53 +57 @@
             int nbProgressBar = ((i + 1) * 100) / files.length;
             try {
+                Integer widthOriginal = Integer.valueOf(PreferencesManagement.getValue(PreferencesEnum.WIDTH_ORIGINALE
+                        .getLabel()));
+                Integer heightOriginal = Integer.valueOf(PreferencesManagement.getValue(PreferencesEnum.HEIGHT_ORIGINAL
+                        .getLabel()));
+                Double chunkSize = Double
+                        .valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE.getLabel()));
                 MainFrame.getInstance().setAdditionalMessage(
                         Messages.getMessage("file") + " " + (i + 1) + "/" + files.length + " : ");
-                ImageService.getInstance().creer(files[i].getCanonicalPath(), thumbPanel.getCategoryId());
+                ImageService.getInstance(Main.sessionManager).creer(files[i].getCanonicalPath(),
+                        thumbPanel.getCategoryId(), widthOriginal, heightOriginal, chunkSize,
+                        ImagesManagement.getInstance().getPrivacyLevel());
                 MainFrame.getInstance().setMessage(files[i].getName() + " " + Messages.getMessage("sendingSuccess"));
             } catch (Exception e) {

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java

@@ -14 +14 @@
 import javax.swing.JLabel;
 
+import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.om.Category;
 import fr.mael.jiwigo.service.CategoryService;
 import fr.mael.jiwigo.service.ImageService;
+import fr.mael.jiwigo.transverse.ImagesManagement;
+import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
+import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 import fr.mael.jiwigo.ui.mainframe.MainFrame;
 
 /**
- * 
+ *
    Copyright (c) 2010, Mael
    All rights reserved.
@@ -45 +49 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
- * Renderer used to display the category list with a hierarchy 
+ * Renderer used to display the category list with a hierarchy
  *
  */
@@ -83 +87 @@
         comboCategories.setRenderer(new ComboCategoryRenderer());
         try {
-            categories = CategoryService.getInstance().makeTree();
+            categories = CategoryService.getInstance(Main.sessionManager).makeTree();
             createCategoriesTree();
         } catch (IOException e) {
@@ -147 +151 @@
             for (File file : filesToSend) {
                 try {
-                    ImageService.getInstance().creer(file.getAbsolutePath(), category.getIdentifiant());
+                    Integer widthOriginal = Integer.valueOf(PreferencesManagement
+                            .getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel()));
+                    Integer heightOriginal = Integer.valueOf(PreferencesManagement
+                            .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel()));
+                    Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE
+                            .getLabel()));
+                    ImageService.getInstance(Main.sessionManager).creer(file.getAbsolutePath(),
+                            category.getIdentifiant(), widthOriginal, heightOriginal, chunkSize,
+                            ImagesManagement.getInstance().getPrivacyLevel());
                 } catch (Exception e) {
                     e.printStackTrace();

extensions/jiwigo/trunk/src/main/resources/temp.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <rsp stat="ok">
-        <image id="83" file="SNC00223.jpg" date_available="2010-08-24 21:44:09"
-                date_creation="0000-00-00" tn_ext="jpg" author="Danièle" hit="3"
-                filesize="205" width="640" height="480" date_metadata_update="2010-08-24"
-                level="0" md5sum="a0bdd501070f75fce94e7007d5dfbd8c"
-                tn_url="http://www.le-guevel.com/piwigo/upload/2010/08/24/thumbnail/TN-20100824214409-8fb71afd.jpg"
-                element_url="http://www.le-guevel.com/piwigo/upload/2010/08/24/20100824214409-8fb71afd.jpg">
-                <name>SNC00223</name>
+        <image id="20" file="20100919131731-692df26f.jpg" date_available="2010-09-19 13:17:31"
+                tn_ext="jpg" author="mael" hit="0" filesize="48" width="450" height="475"
+                date_metadata_update="2010-09-19" level="0"
+                md5sum="692df26f3800cc1aab00421d7c29ff4c"
+                tn_url="http://mael.piwigo.com/uploads/y/c/a/ycajh4petv/2010/09/19/thumbnail/TN-20100919131731-692df26f.jpg"
+                element_url="http://mael.piwigo.com/uploads/y/c/a/ycajh4petv/2010/09/19/20100919131731-692df26f.jpg">
+                <name>10</name>
                 <rates count="0" average="" />
                 <categories>
-                        <category id="25"
-                                url="http://www.le-guevel.com/piwigo/index.php?/category/25"
-                                page_url="http://www.le-guevel.com/piwigo/picture.php?/83/category/25">
-                                <name>Gouesnach</name>
-                                <uppercats>21,25</uppercats>
-                                <global_rank>2.2</global_rank>
+                        <category id="3"
+                                url="http://mael.piwigo.com/index?/category/3-test_de_test_do_not_delete"
+                                page_url="http://mael.piwigo.com/picture?/20/category/3-test_de_test_do_not_delete">
+                                <name>test de test do not delete</name>
+                                <uppercats>1,3</uppercats>
+                                <global_rank>1.1</global_rank>
                         </category>
                 </categories>
-                <tags />
-                <comment_post author="admin"
-                        key="1283118169:7e9b8049cd926362bb217d7b3316d10b" />
+                <tags>
+                        <tag id="1" name="Tag1" url_name="tag1"
+                                url="http://mael.piwigo.com/index?/tags/1-tag1" page_url="http://mael.piwigo.com/picture?/20/tags/1-tag1" />
+                </tags>
+                <comment_post author="mael"
+                        key="1284919810:82b32b18c9b16d34295f586cd88855f3" />
                 <comments page="0" per_page="10" count="3" nb_comments="3">
-                        <comment id="1" date="2010-08-28 21:41:04">
-                                <author>admin</author>
-                                <content>Test d'un commentaire</content>
+                        <comment id="1" date="2010-09-19 15:12:22">
+                                <author>mael</author>
+                                <content>comment test</content>
                         </comment>
-                        <comment id="2" date="2010-08-28 22:06:43">
-                                <author>admin</author>
-                                <content>Test d'un commentaire 2</content>
+                        <comment id="2" date="2010-09-19 15:13:26">
+                                <author>mael</author>
+                                <content>comment test</content>
                         </comment>
-                        <comment id="3" date="2010-08-28 22:29:22">
-                                <author>admin</author>
-                                <content>Test d'un commentaire 3</content>
+                        <comment id="3" date="2010-09-19 15:14:33">
+                                <author>mael</author>
+                                <content>comment test</content>
                         </comment>
                 </comments>

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