From 6eea17afe1cd0d176e1ad03bcf66063140a7b5a1 Mon Sep 17 00:00:00 2001
From: Bojnourdi <kavoos.bojnourdi@edf.fr>
Date: Mon, 24 Aug 2015 21:20:36 +0200
Subject: [PATCH]  Fix FileDaoTest Fix FileService swith Added UpdateFile test

---
 .../com/edf/gde/test/dao/FileDaoTest.java     | 21 +++++++
 .../com/edf/gde/dao/impl/FileDaoImpl.java     |  2 +-
 .../java/com/edf/gde/entities/StudyFiles.java | 60 -------------------
 .../com/edf/gde/services/FileService.java     |  1 +
 4 files changed, 23 insertions(+), 61 deletions(-)
 delete mode 100644 projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/StudyFiles.java

diff --git a/projects/GDE-test/test/com/edf/gde/test/dao/FileDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/FileDaoTest.java
index 7d8bf8c..5aed9ff 100644
--- a/projects/GDE-test/test/com/edf/gde/test/dao/FileDaoTest.java
+++ b/projects/GDE-test/test/com/edf/gde/test/dao/FileDaoTest.java
@@ -68,4 +68,25 @@ public class FileDaoTest extends BaseTest {
         fileDaoClient.deleteFile(createdFile.getId());
         passed();
     }
+    
+    @Test
+    public void updateFileTest() throws Exception {
+        testName("deleteFile");
+        /* Create a new file */
+        Date date = new Date();
+        String fileName = "/home/kavoos/update_test" + date.getTime() + ".txt";
+        FileDaoClient dao = new FileDaoClient();
+        FileTO fileTO = new FileTO();
+        fileTO.setName(fileName);
+        FileTO createdFile = dao.createFile(fileTO);
+        assertNotNull(createdFile);
+        assertTrue(createdFile.getId() != 0);
+        assertEquals(fileName, createdFile.getName());
+        /* Update the file */
+        createdFile.setName(fileName+".update");
+        FileTO updatedFile = dao.updateFile(createdFile);
+        assertNotNull(updatedFile);
+        assertEquals(createdFile.getName(), updatedFile.getName());
+        passed();
+    }
 }
diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/impl/FileDaoImpl.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/impl/FileDaoImpl.java
index a0d1cc1..4133c1d 100644
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/impl/FileDaoImpl.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/dao/impl/FileDaoImpl.java
@@ -40,7 +40,7 @@ public class FileDaoImpl implements FileDao {
     @Override
     public GDEFile updateFile(GDEFile file) {
         GDEFile up = em.merge(file);
-        file.setUpdateDate(new Date());
+        up.setUpdateDate(new Date());
         return up;
     }
 
diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/StudyFiles.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/StudyFiles.java
deleted file mode 100644
index 2a3c149..0000000
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/StudyFiles.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * (C) 2015 EDF
- */
-package com.edf.gde.entities;
-
-/**
- *
- * @author Kavoos
- */
-/*
-@Entity(name = "StudyFiles")
-@Table(name = "study_files", indexes = {
-    @Index(name = "study_file_idx1", columnList = "studyId", unique = false),
-    @Index(name = "study_file_idx2", columnList = "fileId", unique = false)
-})
-public class StudyFiles {
-
-    private static final long serialVersionUID = 1L;
-    @Id
-    @Basic(optional = false)
-    @NotNull
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
-    @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50)
-    private long id;
-    @JoinColumn(name = "studyId")
-    @OneToOne(optional = false)
-    Study study;
-    @OneToOne(optional = false)
-    @JoinColumn(name = "fileId")
-    GDEFile file;
-
-    public StudyFiles() {
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Study getStudy() {
-        return study;
-    }
-
-    public void setStudy(Study study) {
-        this.study = study;
-    }
-
-    public GDEFile getFile() {
-        return file;
-    }
-
-    public void setFile(GDEFile file) {
-        this.file = file;
-    }
-}
-*/
\ No newline at end of file
diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/FileService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/FileService.java
index bf5ab1e..5776bfe 100644
--- a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/FileService.java
+++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/FileService.java
@@ -64,6 +64,7 @@ public class FileService extends BaseService {
                 case UPDATEFILE: {
                     resultTO.setData(toJson(fileEJB.updateFile(fromJson(commandTO.getData(), FileTO.class))));
                 }
+                break;
                 case READFILE: {
                     resultTO.setData(toJson(fileEJB.ReadFile(commandTO.getLong("fileId"))));
                 }
-- 
2.39.2