Fixed tests

.gitignore

@@ -16,3 +16,4 @@ Thumbs.db
 /bower_components
 .tmp/
 .sass-cache
+velocity.log

src/test/java/org/genesys2/server/persistence/domain/mock/TraitServiceMock.java

 package org.genesys2.server.persistence.domain.mock;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.genesys2.server.model.genesys.*;
+import org.genesys2.server.model.genesys.AccessionId;
+import org.genesys2.server.model.genesys.Metadata;
+import org.genesys2.server.model.genesys.Method;
+import org.genesys2.server.model.genesys.Parameter;
+import org.genesys2.server.model.genesys.ParameterCategory;
 import org.genesys2.server.model.impl.Crop;
-import org.genesys2.server.persistence.domain.*;
+import org.genesys2.server.persistence.domain.AccessionTraitRepository;
+import org.genesys2.server.persistence.domain.GenesysLowlevelRepository;
+import org.genesys2.server.persistence.domain.MetadataMethodRepository;
+import org.genesys2.server.persistence.domain.MetadataRepository;
+import org.genesys2.server.persistence.domain.MethodRepository;
+import org.genesys2.server.persistence.domain.ParameterCategoryRepository;
+import org.genesys2.server.persistence.domain.ParameterRepository;
+import org.genesys2.server.persistence.domain.TraitValueRepository;
 import org.genesys2.server.security.AuthUserDetails;
 import org.genesys2.server.service.AclService;
 import org.genesys2.server.service.HtmlSanitizer;
@@ -13,7 +29,6 @@ import org.genesys2.server.service.TraitService;
 import org.genesys2.server.service.impl.GenesysServiceImpl;
 import org.genesys2.spring.SecurityContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -22,18 +37,12 @@ import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @Service
 @Transactional(readOnly = true)
 public class TraitServiceMock implements TraitService{
     public static final Log LOG = LogFactory.getLog(GenesysServiceImpl.class);
 
     @Autowired
-    @Qualifier("genesysLowlevelRepositoryMock")
     private GenesysLowlevelRepository genesysLowlevelRepository;
     @Autowired
     private AclService aclService;

src/test/java/org/genesys2/tests/resttests/AbstractRestTest.java

@@ -251,7 +251,7 @@ public abstract class AbstractRestTest {
         }
 
         @Bean
-        public TokenStore tokenStore() {
+        public JPATokenStore tokenStore() {
             return new OAuth2JPATokenStoreImpl();
         }