[kune-commits] r1870 - in trunk: debian src/main/resources src/test/java/cc/kune/core/server/integration

Sun May 20 23:38:34 CEST 2012

Author: vjrj_
Date: 2012-05-20 23:38:34 +0200 (Sun, 20 May 2012)
New Revision: 1870

Modified:
   trunk/debian/files
   trunk/src/main/resources/wave-server-testing.properties
   trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java
Log:
Test fixed

Modified: trunk/debian/files
===================================================================

--- trunk/debian/files	2012-05-20 21:01:15 UTC (rev 1869)
+++ trunk/debian/files	2012-05-20 21:38:34 UTC (rev 1870)
@@ -1 +1 @@
-kune_0.2.0+b5_all.deb java optional
+kune_0.2.0+b6_all.deb java optional

Modified: trunk/src/main/resources/wave-server-testing.properties
===================================================================
--- trunk/src/main/resources/wave-server-testing.properties	2012-05-20 21:01:15 UTC (rev 1869)
+++ trunk/src/main/resources/wave-server-testing.properties	2012-05-20 21:38:34 UTC (rev 1870)
@@ -130,7 +130,7 @@
 
 # Currently supported search types: memory, lucene.
 # Default value: lucene.
-search_type = lucene
+search_type = memory
 
 # The location where search indexes are stored on disk.
 # Note: This is only used when using the lucene search type. It is ignored

Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java
===================================================================
--- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java	2012-05-20 21:01:15 UTC (rev 1869)
+++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java	2012-05-20 21:38:34 UTC (rev 1870)
@@ -27,6 +27,7 @@
 import org.apache.commons.configuration.ConfigurationException;
 import org.mockito.Mockito;
 import org.waveprotocol.box.server.CoreSettings;
+import org.waveprotocol.box.server.SearchModule;
 import org.waveprotocol.box.server.ServerModule;
 import org.waveprotocol.box.server.persistence.PersistenceModule;
 import org.waveprotocol.box.server.robots.RobotApiModule;
@@ -56,6 +57,7 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.Module;
 import com.google.inject.Scopes;
 import com.google.inject.servlet.RequestScoped;
 import com.google.inject.servlet.SessionScoped;
@@ -72,8 +74,10 @@
       final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class);
       final DataSourceKunePersistModule kuneDataSource = new DataSourceKunePersistModule(
           "kune-tests.properties", TestConstants.PERSISTENCE_UNIT);
+      Module searchModule = injector.getInstance(SearchModule.class);
       final Injector childInjector = injector.createChildInjector(
           wavePersistModule,
+          searchModule,
           kuneDataSource,
           new DataSourceOpenfirePersistModule(kuneDataSource.getKuneProperties()),
           new AbstractModule() {


