Commit 892b0ec1 authored by Matija Obreza's avatar Matija Obreza

Make tests run

parent cd615bd3
......@@ -17,6 +17,7 @@
package org.genesys2.tests.resttests;
import java.io.File;
import java.util.Set;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.SerializationFeature;
......@@ -24,6 +25,7 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IQueue;
import org.apache.velocity.app.VelocityEngine;
import org.elasticsearch.common.collect.Sets;
import org.genesys2.brapi.service.impl.BrAPIServiceImpl;
import org.genesys2.server.aspect.AsAdminAspect;
import org.genesys2.server.filerepository.service.BytesStorageService;
......@@ -83,6 +85,7 @@ import org.genesys2.server.service.ElasticService;
import org.genesys2.server.service.GenesysFilterService;
import org.genesys2.server.service.GenesysRESTService;
import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.GeoRegionService;
import org.genesys2.server.service.GeoService;
import org.genesys2.server.service.HtmlSanitizer;
import org.genesys2.server.service.InstituteFilesService;
......@@ -112,6 +115,7 @@ import org.genesys2.server.service.impl.FilterHandler;
import org.genesys2.server.service.impl.GenesysFilterServiceImpl;
import org.genesys2.server.service.impl.GenesysRESTServiceImpl;
import org.genesys2.server.service.impl.GenesysServiceImpl;
import org.genesys2.server.service.impl.GeoRegionServiceImpl;
import org.genesys2.server.service.impl.GeoServiceImpl;
import org.genesys2.server.service.impl.InstituteFilesServiceImpl;
import org.genesys2.server.service.impl.InstituteServiceImpl;
......@@ -129,6 +133,7 @@ import org.genesys2.server.service.impl.TeamServiceImpl;
import org.genesys2.server.service.impl.TokenVerificationServiceImpl;
import org.genesys2.server.service.impl.UserServiceImpl;
import org.genesys2.server.service.worker.ElasticUpdater;
import org.genesys2.server.service.worker.GeoRegionDataCLDR;
import org.genesys2.server.servlet.controller.rest.AccessionController;
import org.genesys2.server.servlet.controller.rest.CacheController;
import org.genesys2.server.servlet.controller.rest.CropsController;
......@@ -524,7 +529,22 @@ public abstract class AbstractRestTest extends BaseSpringTest {
public BrAPIServiceImpl brapiService() {
return new BrAPIServiceImpl();
}
@Bean
public GeoRegionService geoRegionService() {
return new GeoRegionServiceImpl();
}
@Bean
public GeoRegionDataCLDR geoRegionDataCldr() {
return new GeoRegionDataCLDR();
}
@Bean
public static Set<String> supportedLocales() {
final Set<String> supportedLocales = Sets.newHashSet("en", "es", "de", "fr", "fa", "ar", "ru", "zh", "pt");
return supportedLocales;
}
}
@Autowired
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment