You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/02/18 21:00:52 UTC

svn commit: r1660714 - /myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java

Author: lofwyr
Date: Wed Feb 18 20:00:52 2015
New Revision: 1660714

URL: http://svn.apache.org/r1660714
Log:
TOBAGO-1433: Supported resource types should be configurable
init

Modified:
    myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java

Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java?rev=1660714&r1=1660713&r2=1660714&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java Wed Feb 18 20:00:52 2015
@@ -35,6 +35,7 @@ import org.apache.myfaces.tobago.context
 import org.apache.myfaces.tobago.context.Theme;
 import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
 import org.apache.myfaces.tobago.internal.mock.faces.MockTheme;
+import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.slf4j.Logger;
@@ -81,6 +82,11 @@ public abstract class AbstractTobagoTest
     tobagoConfig.initProjectState(servletContext);
     tobagoConfig.initDefaultValidatorInfo();
     servletContext.setAttribute(TobagoConfig.TOBAGO_CONFIG, tobagoConfig);
+    try {
+      MimeTypeUtils.init(servletContext);
+    } catch (IllegalStateException e) {
+      // ignoring double call
+    }
 
     final ClientProperties clientProperties = new ClientProperties();
     clientProperties.setTheme(one);