Migrate all other Rest tests to SeamAutowire.

zanata · May 4, 2012 · ee9a134 · ee9a134
1 parent a6ba7c0
commit ee9a134
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java b/server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
@@ -26,6 +26,7 @@
 import org.zanata.rest.dto.Glossary;
 import org.zanata.rest.dto.GlossaryEntry;
 import org.zanata.rest.dto.GlossaryTerm;
+import org.zanata.seam.SeamAutowire;
 import org.zanata.service.impl.LocaleServiceImpl;
 
 public class GlossaryRestTest extends ZanataRestTest
@@ -35,6 +36,7 @@ public class GlossaryRestTest extends ZanataRestTest
    IMocksControl mockControl = EasyMock.createControl();
    Identity mockIdentity = mockControl.createMock(Identity.class);
    IGlossaryResource glossaryService;
+   SeamAutowire seam = SeamAutowire.instance();
 
    @BeforeClass
    void beforeClass()
@@ -65,13 +67,13 @@ protected void prepareDBUnitOperations()
    @Override
    protected void prepareResources()
    {
-      GlossaryDAO glossaryDAO = new GlossaryDAO(getSession());
+      seam.reset();
+      seam.ignoreNonResolvable()
+            .use("session", getSession())
+            .use("identity", mockIdentity)
+            .useImpl(LocaleServiceImpl.class);
 
-      LocaleServiceImpl localeService = new LocaleServiceImpl();
-      LocaleDAO localeDAO = new LocaleDAO(getSession());
-      localeService.setLocaleDAO(localeDAO);
-
-      GlossaryService glossaryService = new GlossaryService(glossaryDAO, mockIdentity, localeService);
+      GlossaryService glossaryService = seam.autowire(GlossaryService.class);
 
       resources.add(glossaryService);
    }

diff --git a/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java b/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
@@ -23,13 +23,15 @@
 import org.zanata.dao.ProjectIterationDAO;
 import org.zanata.rest.client.IProjectIterationResource;
 import org.zanata.rest.dto.ProjectIteration;
+import org.zanata.seam.SeamAutowire;
 
 public class ProjectIterationRestTest extends ZanataRestTest
 {
 
    private final String RESOURCE_PATH = "/projects/p/sample-project/iterations/i/";
    IMocksControl mockControl = EasyMock.createControl();
    Identity mockIdentity = mockControl.createMock(Identity.class);
+   SeamAutowire seam = SeamAutowire.instance();
 
    @BeforeClass
    void beforeClass()
@@ -52,13 +54,12 @@ protected void prepareDBUnitOperations()
    @Override
    protected void prepareResources()
    {
+      seam.reset();
+      seam.ignoreNonResolvable()
+            .use("session", getSession())
+            .use("identity", mockIdentity);
 
-      ProjectDAO projectDAO = new ProjectDAO(getSession());
-      ProjectIterationDAO projectIterationDAO = new ProjectIterationDAO(getSession());
-      DocumentDAO documentDAO = new DocumentDAO(getSession());
-      ETagUtils eTagUtils = new ETagUtils(getSession(), documentDAO);
-
-      ProjectIterationService projectIterationService = new ProjectIterationService(projectDAO, projectIterationDAO, mockIdentity, eTagUtils);
+      ProjectIterationService projectIterationService = seam.autowire(ProjectIterationService.class);
 
       resources.add(projectIterationService);
    }

diff --git a/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java b/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
@@ -28,13 +28,15 @@
 import org.zanata.rest.client.IProjectResource;
 import org.zanata.rest.dto.Project;
 import org.zanata.rest.dto.ProjectType;
+import org.zanata.seam.SeamAutowire;
 
 public class ProjectRestTest extends ZanataRestTest
 {
 
    private final String RESOURCE_PATH = "/projects/p/";
    IMocksControl mockControl = EasyMock.createControl();
    Identity mockIdentity = mockControl.createMock(Identity.class);
+   SeamAutowire seam = SeamAutowire.instance();
 
    @BeforeClass
    void beforeClass()
@@ -58,12 +60,12 @@ protected void prepareDBUnitOperations()
    @Override
    protected void prepareResources()
    {
-      ProjectDAO projectDAO = new ProjectDAO(getSession());
-      AccountDAO accountDAO = new AccountDAO(getSession());
-      DocumentDAO documentDAO = new DocumentDAO(getSession());
-      ETagUtils eTagUtils = new ETagUtils(getSession(), documentDAO);
+      seam.reset();
+      seam.ignoreNonResolvable()
+          .use("session", getSession())
+          .use("identity", mockIdentity);
 
-      ProjectService projectService = new ProjectService(projectDAO, accountDAO, mockIdentity, eTagUtils);
+      ProjectService projectService = seam.autowire(ProjectService.class);
 
       resources.add(projectService);
    }