Changeset 3205

Timestamp:

07/29/13 08:43:04 (11 years ago)

Author:

olhsha

Message:

adding userDao and the implementation, and the corresponding xml configuration files, and the corresponding constructor to the mockObjectFactory

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend

Files:

• nb-configuration.xml (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/UserDao.java (added)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java (added)
• src/main/resources/spring-config/userDao.xml (added)
• src/test/java/eu/dasish/annotation/backend/MockObjectsFactory.java (modified) (2 diffs)
• src/test/java/eu/dasish/annotation/backend/rest/ResourcesTest.java (modified) (1 diff)
• src/test/resources/spring-test-config/mockUserDao.xml (added)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml

@@ -16 +16 @@
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
     </properties>
+    <spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
+        <config-files>
+            <config-file>src/main/resources/spring-config/userDao.xml</config-file>
+            <config-file>src/test/resources/mockUserDao.xml</config-file>
+        </config-files>
+        <config-file-groups/>
+    </spring-data>
 </project-shared-configuration>

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/MockObjectsFactory.java

@@ -20 +20 @@
 import eu.dasish.annotation.backend.dao.AnnotationDao;
 import eu.dasish.annotation.backend.dao.NotebookDao;
+import eu.dasish.annotation.backend.dao.UserDao;
 import org.jmock.Mockery;
 
@@ -42 +43 @@
         return context.mock(AnnotationDao.class);
     }
+    
+    public UserDao newUserDao() {
+        return context.mock(UserDao.class);
+    }
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/ResourcesTest.java

@@ -35 +35 @@
     
     public ResourcesTest(String packageName) {
+        
+        // debug
+        
+        
         super(new WebAppDescriptor.Builder(packageName)
                 .servletClass(SpringServlet.class)