wip: merge all tests to cdiunit

zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java

@@ -28,6 +28,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import com.beust.jcommander.internal.Maps;
 import org.zanata.util.IServiceLocator;
 import org.zanata.util.Synchronized;
 import org.zanata.ServerConstants;
@@ -49,18 +50,18 @@ public class DatabaseBackedConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Map<String, String> configurationValues;
+    private final Map<String, String> configurationValues = Maps.newHashMap();
 
     @Inject
-    private IServiceLocator serviceLocator;
+    private ApplicationConfigurationDAO applicationConfigurationDAO;
 
     /**
      * Resets the store by clearing out all values. This means that values will
      * need to be reloaded as they are requested.
      */
     @PostConstruct
     public void reset() {
-        configurationValues = new HashMap<String, String>();
+        configurationValues.clear();
     }
 
     /**
@@ -76,10 +77,8 @@ public void reset(String key) {
 
     private String getConfigValue(String key) {
         if (!configurationValues.containsKey(key)) {
-            ApplicationConfigurationDAO appConfigDAO =
-                    serviceLocator.getInstance(ApplicationConfigurationDAO.class);
             HApplicationConfiguration configRecord =
-                    appConfigDAO.findByKey(key);
+                    applicationConfigurationDAO.findByKey(key);
             String storedVal = null;
             if (configRecord != null) {
                 storedVal = configRecord.getValue();

zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

@@ -124,9 +124,11 @@ private Set<String> getSubKeys(String base) {
             Context ctx = new InitialContext();
             NamingEnumeration<NameClassPair> pairs = ctx.list(base);
             Set<String> results = new HashSet<String>();
-            while (pairs.hasMore()) {
-                NameClassPair pair = pairs.next();
-                results.add(pair.getName());
+            if(pairs != null) {
+                while (pairs.hasMore()) {
+                    NameClassPair pair = pairs.next();
+                    results.add(pair.getName());
+                }
             }
 
             return results;

zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java

@@ -22,13 +22,9 @@
 
 
 import java.io.Serializable;
-import java.util.Iterator;
-import java.util.Set;
 
-import org.apache.deltaspike.core.api.exclude.Exclude;
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import javax.inject.Inject;
 import javax.inject.Named;
-import org.zanata.util.ServiceLocator;
 
 /**
  * This permission resolver will use the
@@ -43,6 +39,9 @@
 @javax.enterprise.context.ApplicationScoped
 public class CustomPermissionResolver implements Serializable {
 
+    @Inject
+    private PermissionEvaluator evaluator;
+
     private static final long serialVersionUID = 6302681723997573877L;
 
     public boolean hasPermission(Object target, String action) {
@@ -57,9 +56,6 @@ public boolean hasPermission(Object target, String action) {
     }
 
     private boolean hasPermission(String action, Object... targets) {
-        PermissionEvaluator evaluator =
-                ServiceLocator.instance()
-                        .getInstance(PermissionEvaluator.class);
         return evaluator.checkPermission(action, targets);
     }
 

zanata-war/src/test/java/org/zanata/ZanataJpaTest.java

@@ -65,8 +65,6 @@ protected Session getSession() {
 
     @BeforeClass
     public static void initializeEMF() {
-        // let SeamAutowire patch Seam before someone else loads it:
-        SeamAutowire.instance();
         log.debug("Initializing EMF");
         emf =
                 Persistence.createEntityManagerFactory(PERSIST_NAME,