From 81c4c4904a52a212b41e3fb48a31a9d0cbcad504 Mon Sep 17 00:00:00 2001
From: Bojnourdi <kavoos.bojnourdi@edf.fr>
Date: Thu, 13 Aug 2015 10:47:19 +0200
Subject: [PATCH] Working on unit test

---
 .../{MetadataService.java => AttributesService.java} |  2 +-
 .../test/com/edf/gde/dao/AttributeDaoClient.java     | 12 ++++++++++++
 .../test/com/edf/gde/test/dao/AttributeDaoTest.java  | 12 ++++++++++++
 projects/GDE_App/GDE-war/web/WEB-INF/web.xml         | 12 ++++++------
 4 files changed, 31 insertions(+), 7 deletions(-)
 rename projects/GDE_App/GDE-war/src/java/com/edf/gde/services/{MetadataService.java => AttributesService.java} (98%)
 create mode 100644 projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java
 create mode 100644 projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java

diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/AttributesService.java
similarity index 98%
rename from projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java
rename to projects/GDE_App/GDE-war/src/java/com/edf/gde/services/AttributesService.java
index 05352de..3551413 100644
--- a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/MetadataService.java
+++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/AttributesService.java
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author kavoos
  */
-public class MetadataService extends BaseService {
+public class AttributesService extends BaseService {
 
     public static final String ServiceName = "MetadataService";
     public static final int CREATEATTRIBUTE = 1;
diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java
new file mode 100644
index 0000000..dc90238
--- /dev/null
+++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/AttributeDaoClient.java
@@ -0,0 +1,12 @@
+/*
+ * (C) 2015 EDF
+ */
+package com.edf.gde.dao;
+
+/**
+ *
+ * @author Kavoos
+ */
+public class AttributeDaoClient extends BaseDao {
+    
+}
diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java b/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java
new file mode 100644
index 0000000..f3daa01
--- /dev/null
+++ b/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/AttributeDaoTest.java
@@ -0,0 +1,12 @@
+/*
+ * (C) 2015 EDF
+ */
+package com.edf.gde.test.dao;
+
+/**
+ *
+ * @author mordicus
+ */
+public class AttributeDaoTest {
+    
+}
diff --git a/projects/GDE_App/GDE-war/web/WEB-INF/web.xml b/projects/GDE_App/GDE-war/web/WEB-INF/web.xml
index 5f8f095..0814a48 100644
--- a/projects/GDE_App/GDE-war/web/WEB-INF/web.xml
+++ b/projects/GDE_App/GDE-war/web/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
     <servlet>
-        <servlet-name>MetadataService</servlet-name>
-        <servlet-class>com.edf.gde.services.MetadataService</servlet-class>
+        <servlet-name>AttributesService</servlet-name>
+        <servlet-class>com.edf.gde.services.AttributesService</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>UserServce</servlet-name>
@@ -12,10 +12,6 @@
         <servlet-name>StudyService</servlet-name>
         <servlet-class>com.edf.gde.services.StudyService</servlet-class>
     </servlet>
-    <servlet-mapping>
-        <servlet-name>MetadataService</servlet-name>
-        <url-pattern>/MetadataService</url-pattern>
-    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>UserServce</servlet-name>
         <url-pattern>/UserService</url-pattern>
@@ -24,6 +20,10 @@
         <servlet-name>StudyService</servlet-name>
         <url-pattern>/StudyService</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>AttributesService</servlet-name>
+        <url-pattern>/AttributesService</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30
-- 
2.39.2