some changes

diff --git a/source/mir/core/test/Test.java b/source/mir/core/test/Test.java
index 4fcb675..59b247b 100755 (executable)
--- a/source/mir/core/test/Test.java
+++ b/source/mir/core/test/Test.java
@@ -38,12 +38,15 @@ import org.apache.log4j.BasicConfigurator;
 
 import mir.core.model.Audio;
 import mir.core.model.Content;
+import mir.core.model.IContent;
+import mir.core.model.IImage;
 import mir.core.model.Image;
 import mir.core.model.Media;
 import mir.core.model.Topic;
 import mir.core.model.UploadedMedia;
 import mir.core.model.Video;
 import mir.core.service.storage.ContentService;
+import mir.core.service.storage.ImageService;
 import net.sf.hibernate.Criteria;
 import net.sf.hibernate.HibernateException;
 import net.sf.hibernate.Session;
@@ -53,7 +56,7 @@ import net.sf.hibernate.cfg.Configuration;
 
 /**
  * Test
- * @version $Id: Test.java,v 1.4 2003/08/18 18:22:24 idfx Exp $
+ * @version $Id: Test.java,v 1.5 2003/08/19 00:43:02 idfx Exp $
  * @author idefix
  */
 public class Test {
@@ -78,15 +81,20 @@ public class Test {
                        }
                        transaction.commit();
                        session.close();
-                       System.out.println("****** content media");
+
                        ContentService contentService = new ContentService(factory);
+                       
+                       Object content = contentService.load(new Integer(7));
+                       System.out.println(content + content.getClass().getName());
+                       
+                       System.out.println("****** content media");
+
                        list = contentService.list(0,10);
                        for(Iterator iterator = list.iterator(); iterator.hasNext();){
                                Content media = (Content)iterator.next();
                                System.out.println(media.getTitle());
                        }
-                       Content content = (Content)contentService.load(new Integer(7));
-                       System.out.println(content);
+
                        session = factory.openSession();
                        transaction = session.beginTransaction();
                        criteria = session.createCriteria(UploadedMedia.class);
@@ -96,13 +104,19 @@ public class Test {
                                UploadedMedia media = (UploadedMedia)iterator.next();
                                System.out.println(media.toString() + media.getIconPath());
                        }
-                       criteria = session.createCriteria(Image.class);
-                       list = criteria.setMaxResults(10).list();
+                       transaction.commit();
+                       session.close();
+                       ImageService imageService = new ImageService(factory);
+                       list = imageService.list(0,10);
                        System.out.println("****** image media");
                        for(Iterator iterator = list.iterator(); iterator.hasNext();){
                                Image media = (Image)iterator.next();
                                System.out.println(media.toString() + media.getIconPath());
                        }
+                       IImage image = (IImage)imageService.load(new Integer(18));
+                       System.out.println(image);
+                       session = factory.openSession();
+                       transaction = session.beginTransaction();
                        criteria = session.createCriteria(Audio.class);
                        list = criteria.setMaxResults(10).list();
                        System.out.println("****** audio media");