[Tynstep-svn] r156 - in trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client: . common presenter

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2010-07-31 02:13:33 -0700 (Sat, 31 Jul 2010)
New Revision: 156

Removed:
   trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/service/
   trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/toolkit/
Modified:
   trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/OsisUtilsTest.java
   trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/StringUtilsTest.java
   trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/BookmarkPresenterTest.java
   trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/ModuleSidebarPresenterTest.java
Log:
commiting fix to remove unecessary compile files causing assembler to overwrite gwtp compilation

Modified: trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/OsisUtilsTest.java
===================================================================
--- trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/OsisUtilsTest.java	2010-07-25 20:24:25 UTC (rev 155)
+++ trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/OsisUtilsTest.java	2010-07-31 09:13:33 UTC (rev 156)
@@ -4,6 +4,8 @@
 
 import org.junit.Test;
 
+import com.tyndalehouse.step.web.client.framework.utils.OsisUtils;
+
 public class OsisUtilsTest {
     /**
      * tests the get verse number returns the verse number

Modified: trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/StringUtilsTest.java
===================================================================
--- trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/StringUtilsTest.java	2010-07-25 20:24:25 UTC (rev 155)
+++ trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/common/StringUtilsTest.java	2010-07-31 09:13:33 UTC (rev 156)
@@ -5,6 +5,8 @@
 
 import org.junit.Test;
 
+import com.tyndalehouse.step.web.client.framework.utils.StringUtils;
+
 public class StringUtilsTest {
     /**
      * Test the isEmpty method on the client

Modified: trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/BookmarkPresenterTest.java
===================================================================
--- trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/BookmarkPresenterTest.java	2010-07-25 20:24:25 UTC (rev 155)
+++ trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/BookmarkPresenterTest.java	2010-07-31 09:13:33 UTC (rev 156)
@@ -13,7 +13,7 @@
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.tyndalehouse.step.web.client.framework.ScripturePresenterPosition;
 import com.tyndalehouse.step.web.client.framework.StepEventBus;
-import com.tyndalehouse.step.web.client.presenter.BookmarkPresenter.Display;
+import com.tyndalehouse.step.web.client.presenter.display.BookmarkDisplay;
 import com.tyndalehouse.step.web.client.toolkit.handlers.BookmarkHandler;
 
 public class BookmarkPresenterTest extends MockTest {
@@ -30,7 +30,7 @@
      */
     @Test
     public void testSafelyAddRemoveBookmarks() {
-        final BookmarkPresenter.Display bookmarkView = getMock().mock(BookmarkPresenter.Display.class);
+        final BookmarkDisplay bookmarkView = getMock().mock(BookmarkDisplay.class);
         final BookmarkHandler bookmarkHandlers = getMock().mock(BookmarkHandler.class);
         final BookmarkPresenter bp = new BookmarkPresenter();
         bp.setView(bookmarkView);
@@ -61,7 +61,7 @@
     @Test
     public void testOnScriptureChangedSuccessfullyNoBookmarks() {
         final BookmarkPresenter bp = new BookmarkPresenter();
-        final Display view = getMock().mock(BookmarkPresenter.Display.class);
+        final BookmarkDisplay view = getMock().mock(BookmarkDisplay.class);
         final BookmarkHandler handler = getMock().mock(BookmarkHandler.class);
         bp.setView(view);
 
@@ -82,7 +82,7 @@
     @Test
     public void testOnScriptureChangedSuccessfullyTwoBookmarks() {
         final BookmarkPresenter bp = new BookmarkPresenter();
-        final Display view = getMock().mock(BookmarkPresenter.Display.class);
+        final BookmarkDisplay view = getMock().mock(BookmarkDisplay.class);
         final BookmarkHandler handler = getMock().mock(BookmarkHandler.class);
         bp.setView(view);
 
@@ -105,7 +105,7 @@
     @Test
     public void testOnScriptureChangedSuccessfullySwitchBookmarks() {
         final BookmarkPresenter bp = new BookmarkPresenter();
-        final Display view = getMock().mock(BookmarkPresenter.Display.class);
+        final BookmarkDisplay view = getMock().mock(BookmarkDisplay.class);
         final BookmarkHandler handler = getMock().mock(BookmarkHandler.class);
         bp.setView(view);
 
@@ -162,7 +162,7 @@
     @Test
     public void testOnScriptureChangedSuccessfullyTooManyBookmarks() {
         final BookmarkPresenter bp = new BookmarkPresenter();
-        final Display view = getMock().mock(BookmarkPresenter.Display.class);
+        final BookmarkDisplay view = getMock().mock(BookmarkDisplay.class);
         final BookmarkHandler handler = getMock().mock(BookmarkHandler.class);
         bp.setView(view);
 

Modified: trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/ModuleSidebarPresenterTest.java
===================================================================
--- trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/ModuleSidebarPresenterTest.java	2010-07-25 20:24:25 UTC (rev 155)
+++ trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/presenter/ModuleSidebarPresenterTest.java	2010-07-31 09:13:33 UTC (rev 156)
@@ -5,14 +5,14 @@
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.tyndalehouse.step.web.client.framework.StepEventBus;
-import com.tyndalehouse.step.web.client.presenter.ModuleSideBarPresenter.Display;
-import com.tyndalehouse.step.web.client.toolkit.SideBarModule;
+import com.tyndalehouse.step.web.client.presenter.display.ModuleSideBarDisplay;
+import com.tyndalehouse.step.web.client.toolkit.data.SideBarModule;
 
 public class ModuleSidebarPresenterTest extends MockTest {
     @Test
     public void testOnStart() {
         final ModuleSideBarPresenter sidebar = new ModuleSideBarPresenter();
-        final Display mockView = getMock().mock(ModuleSideBarPresenter.Display.class);
+        final ModuleSideBarDisplay mockView = getMock().mock(ModuleSideBarDisplay.class);
         final StepEventBus mockEventBus = getMock().mock(StepEventBus.class);
         final MockHasClickHandlers mockClickHandler = new MockHasClickHandlers();