Author: manolo
Date: Wed May 2 17:19:47 2012
New Revision: 1333120
URL: http://svn.apache.org/viewvc?rev=1333120&view=rev
Log:
Fix client tests
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java?rev=1333120&r1=1333119&r2=1333120&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
Wed May 2 17:19:47 2012
@@ -78,6 +78,7 @@ public abstract class HupaMvpTestCase ex
store = storeCache.get(testUser);
httpSession.setAttribute(SConsts.USER_SESS_ATTR, testUser);
} catch (Exception e) {
+ e.printStackTrace();
}
}
}
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java?rev=1333120&r1=1333119&r2=1333120&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceClientTestModule.java
Wed May 2 17:19:47 2012
@@ -19,13 +19,15 @@
package org.apache.hupa.client.guice;
+import java.util.Properties;
+
import javax.mail.Session;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.server.InMemoryIMAPStoreCache;
import org.apache.hupa.server.guice.AbstractGuiceTestModule;
+import
org.apache.hupa.server.guice.demo.DemoGuiceServerModule.DemoIMAPStoreCache;
import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
import org.apache.hupa.server.handler.AbstractSendMessageHandler;
@@ -48,6 +50,7 @@ import org.apache.hupa.server.mock.MockI
import org.apache.hupa.server.mock.MockLogProvider;
import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
+import org.apache.hupa.server.utils.ConfigurationProperties;
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.Contacts;
@@ -64,7 +67,11 @@ public class GuiceClientTestModule exten
@Override
protected void configureHandlers() {
- Names.bindProperties(binder(), MockConstants.mockProperties);
+
+ Properties p = MockConstants.mockProperties;
+ ConfigurationProperties.validateProperties(p);
+
+ Names.bindProperties(binder(), p);
bind(Session.class).toProvider(JavaMailSessionProvider.class);
bind(HttpSession.class).toProvider(MockHttpSessionProvider.class);
@@ -72,7 +79,7 @@ public class GuiceClientTestModule exten
bind(Log.class).toProvider(MockLogProvider.class).in(Singleton.class);
bind(IMAPStore.class).to(MockIMAPStore.class);
-
bind(IMAPStoreCache.class).to(InMemoryIMAPStoreCache.class).in(Singleton.class);
+
bind(IMAPStoreCache.class).to(DemoIMAPStoreCache.class).in(Singleton.class);
bind(LoginUserHandler.class);
bind(LogoutUserHandler.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]