You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2018/10/19 09:23:05 UTC

[myfaces] branch master updated: unused imports

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new c715d39  unused imports
c715d39 is described below

commit c715d3962ac39176f0ac01ab0355b41d3cba9db7
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Fri Oct 19 11:23:00 2018 +0200

    unused imports
---
 api/src/main/java/javax/faces/component/_UIWebsocket.java    |  1 -
 .../test/java/javax/faces/application/ApplicationTest.java   |  2 --
 .../test/java/javax/faces/application/MockApplication.java   |  1 -
 .../java/javax/faces/component/UIComponentEncodeAllTest.java |  3 ---
 .../faces/component/UIComponentInvokeOnComponentTest.java    |  3 ---
 api/src/test/java/javax/faces/component/UIInputTest.java     |  3 ---
 api/src/test/java/javax/faces/component/UIViewRootTest.java  |  3 ---
 .../java/javax/faces/component/_SelectItemsUtilTest.java     |  1 -
 .../test/java/javax/faces/convert/NumberConverterTest.java   |  1 -
 .../apache/myfaces/application/ApplicationImplJsfTest.java   | 12 ------------
 .../org/apache/myfaces/application/ApplicationImplTest.java  |  6 ------
 .../apache/myfaces/application/ResourceHandlerImplTest.java  |  4 ----
 .../digister/DigesterFacesConfigUnmarshallerImplTest.java    |  9 ---------
 .../context/servlet/ServletExternalContextImplTest.java      |  4 ----
 .../myfaces/event/PostAddToViewEventNoPssTestCase.java       | 12 ------------
 .../myfaces/lifecycle/MyFacesRequestJUnitTestCase.java       |  1 -
 .../apache/myfaces/lifecycle/RestoreViewExecutorTest.java    |  6 ------
 .../apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java |  2 --
 .../mc/test/core/runner/AbstractJsfTestContainer.java        |  2 --
 .../org/apache/myfaces/renderkit/ErrorPageWriterTest.java    |  1 -
 .../apache/myfaces/renderkit/html/HtmlLabelRendererTest.java |  3 ---
 .../apache/myfaces/renderkit/html/HtmlLinkRendererTest.java  |  5 -----
 .../renderkit/html/HtmlRolePassedThroughTestCase.java        |  1 -
 .../HtmlSelectManyCheckboxClientBehaviorRendererTest.java    |  2 --
 .../org/apache/myfaces/view/facelets/ExceptionTestCase.java  |  2 --
 .../facelets/compiler/HTML5FaceletsProcessingTestCase.java   |  2 --
 .../view/facelets/compiler/UniqueComponentIdTestCase.java    |  1 -
 .../apache/myfaces/view/facelets/component/UIRepeatTest.java |  3 ---
 .../myfaces/view/facelets/el/CacheELExpressionsTestCase.java |  1 -
 .../view/facelets/el/SerializableELExpressionsTestCase.java  |  2 --
 .../myfaces/view/facelets/mock/MockServletInputStream.java   |  1 -
 .../pss/acid/AcidARCacheELMyFacesRequestTestCase.java        |  1 -
 .../facelets/pss/acid/component/UIAddSimpleComponentVDL.java |  1 -
 .../composite/CompositeComponentActionListenerTestCase.java  |  2 --
 .../tag/composite/CompositeComponentCCRefTestCase.java       |  2 --
 .../CompositeComponentConditionalButtonTestCase.java         |  2 --
 .../CompositeComponentMethodExpressionTestCase.java          |  2 --
 .../tag/composite/CompositeComponentValidatorTestCase.java   |  2 --
 .../CompositeComponentValueChangeListenerTestCase.java       |  2 --
 .../facelets/tag/jsf/core/reset/ResetValuesTestCase.java     |  1 -
 .../view/facelets/tag/jstl/core/JstlCoreTestCase.java        |  1 -
 .../myfaces/view/facelets/tag/ui/IncludeParamTestCase.java   |  4 ----
 .../apache/myfaces/view/facelets/tag/ui/TestUserTags.java    |  3 ---
 .../view/facelets/tag/ui/template/CompositionTestCase.java   |  1 -
 .../view/facelets/tag/ui/template/IncludeTestCase.java       |  1 -
 .../view/facelets/tag/ui/template/UserTagTestCase.java       |  1 -
 .../updateheadres/UpdateHeadDynamicViewTestCase.java         |  1 -
 .../org/apache/myfaces/shared/util/MessageUtilsTest.java     |  1 -
 .../myfaces/shared/renderkit/html/util/HTMLEncoderTest.java  |  5 -----
 .../myfaces/shared/util/CachedStateUtilsAES_CBCTest.java     |  2 --
 .../shared/util/CachedStateUtilsBlowfish_ECBTest.java        |  2 --
 .../myfaces/shared/util/CachedStateUtilsDefaultTest.java     |  2 --
 .../shared/util/CachedStateUtilsTripleDES_ECBTest.java       |  2 --
 .../apache/myfaces/shared/util/InitVector_CBCTestCase.java   |  1 -
 .../org/apache/myfaces/shared/util/MessageUtilsTest.java     |  1 -
 .../org/apache/myfaces/shared/util/SecretKeyCacheTest.java   |  1 -
 .../myfaces/shared/util/SecretKeyConfigurationTest.java      |  1 -
 .../apache/myfaces/shared/util/StateUtilsAES_CBCTest.java    |  2 --
 .../myfaces/shared/util/StateUtilsBlowfish_ECBTest.java      |  2 --
 .../apache/myfaces/shared/util/StateUtilsDefaultTest.java    |  2 --
 .../myfaces/shared/util/StateUtilsTripleDES_ECBTest.java     |  2 --
 61 files changed, 153 deletions(-)

diff --git a/api/src/main/java/javax/faces/component/_UIWebsocket.java b/api/src/main/java/javax/faces/component/_UIWebsocket.java
index e2dc0b0..9eb52bc 100644
--- a/api/src/main/java/javax/faces/component/_UIWebsocket.java
+++ b/api/src/main/java/javax/faces/component/_UIWebsocket.java
@@ -20,7 +20,6 @@
 package javax.faces.component;
 
 import java.io.Serializable;
-import javax.faces.component.behavior.ClientBehaviorHolder;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
 
diff --git a/api/src/test/java/javax/faces/application/ApplicationTest.java b/api/src/test/java/javax/faces/application/ApplicationTest.java
index cd521b7..c82dac7 100644
--- a/api/src/test/java/javax/faces/application/ApplicationTest.java
+++ b/api/src/test/java/javax/faces/application/ApplicationTest.java
@@ -18,10 +18,8 @@
  */
 package javax.faces.application;
 
-import javax.el.ValueExpression;
 
 import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
-import org.junit.Test;
 
 /**
  * Tests for {@link Application}
diff --git a/api/src/test/java/javax/faces/application/MockApplication.java b/api/src/test/java/javax/faces/application/MockApplication.java
index dfe733f..fd6e4ac 100644
--- a/api/src/test/java/javax/faces/application/MockApplication.java
+++ b/api/src/test/java/javax/faces/application/MockApplication.java
@@ -20,7 +20,6 @@ package javax.faces.application;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.event.ActionListener;
 import javax.faces.validator.Validator;
diff --git a/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java b/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
index 00e133f..ab75d24 100644
--- a/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
+++ b/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
@@ -21,9 +21,6 @@ package javax.faces.component;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
diff --git a/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java b/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
index 668c3c3..9e23f1f 100644
--- a/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
+++ b/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
@@ -21,9 +21,6 @@ package javax.faces.component;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
 
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
diff --git a/api/src/test/java/javax/faces/component/UIInputTest.java b/api/src/test/java/javax/faces/component/UIInputTest.java
index 0f6bc36..61dedc9 100644
--- a/api/src/test/java/javax/faces/component/UIInputTest.java
+++ b/api/src/test/java/javax/faces/component/UIInputTest.java
@@ -29,7 +29,6 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.el.MethodExpression;
 import javax.el.ValueExpression;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.visit.VisitContext;
@@ -37,7 +36,6 @@ import javax.faces.component.visit.VisitHint;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
-import javax.faces.event.PhaseId;
 import javax.faces.event.ValueChangeEvent;
 import javax.faces.validator.LengthValidator;
 import javax.faces.validator.Validator;
@@ -48,7 +46,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.myfaces.mock.MockRenderedValueExpression;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
-import org.apache.myfaces.test.el.MockMethodExpression;
 import org.apache.myfaces.test.el.MockValueExpression;
 import org.apache.myfaces.test.mock.visit.MockVisitCallback;
 
diff --git a/api/src/test/java/javax/faces/component/UIViewRootTest.java b/api/src/test/java/javax/faces/component/UIViewRootTest.java
index da7166a..2144b6d 100644
--- a/api/src/test/java/javax/faces/component/UIViewRootTest.java
+++ b/api/src/test/java/javax/faces/component/UIViewRootTest.java
@@ -18,11 +18,9 @@
  */
 package javax.faces.component;
 
-import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.aryEq;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.getCurrentArguments;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
@@ -55,7 +53,6 @@ import javax.faces.webapp.FacesServlet;
 import org.apache.myfaces.TestRunner;
 import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
 import org.apache.myfaces.test.mock.MockFacesContext12;
-import org.easymock.IAnswer;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
 import org.junit.After;
diff --git a/api/src/test/java/javax/faces/component/_SelectItemsUtilTest.java b/api/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
index ced636b..6e36a75 100644
--- a/api/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
+++ b/api/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class _SelectItemsUtilTest extends AbstractJsfTestCase
diff --git a/api/src/test/java/javax/faces/convert/NumberConverterTest.java b/api/src/test/java/javax/faces/convert/NumberConverterTest.java
index 0c18e28..74c15f3 100644
--- a/api/src/test/java/javax/faces/convert/NumberConverterTest.java
+++ b/api/src/test/java/javax/faces/convert/NumberConverterTest.java
@@ -25,7 +25,6 @@ import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class NumberConverterTest extends AbstractJsfTestCase
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
index d518775..dd16009 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplJsfTest.java
@@ -19,30 +19,18 @@
 package org.apache.myfaces.application;
 
 import java.beans.BeanInfo;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
 
 import javax.el.ExpressionFactory;
-import javax.el.VariableMapper;
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.ApplicationWrapper;
 import javax.faces.application.Resource;
 import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
-import javax.faces.component.UIOutput;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
 import javax.faces.view.facelets.FaceletContext;
 
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 import org.apache.myfaces.test.el.MockExpressionFactory;
-import org.apache.myfaces.test.el.MockVariableMapper;
-import org.apache.myfaces.test.mock.MockServletContext;
-import org.apache.myfaces.test.mock.resource.MockSimpleResource;
-import org.apache.myfaces.view.facelets.MockFaceletViewDeclarationLanguage;
 import org.apache.myfaces.view.facelets.impl.FaceletCacheFactoryImpl;
 import org.apache.myfaces.view.facelets.mock.MockViewDeclarationLanguageFactory;
 import org.easymock.classextension.EasyMock;
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
index 1eb39fc..470a599 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
@@ -22,7 +22,6 @@ import static org.apache.myfaces.test.AssertThrowables.assertThrowable;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.isNull;
 import static org.easymock.classextension.EasyMock.createMock;
 import static org.easymock.classextension.EasyMock.replay;
 
@@ -31,10 +30,8 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 
 import javax.el.ELContext;
-import javax.el.ELResolver;
 import javax.el.ValueExpression;
 import javax.faces.FacesException;
-import javax.faces.application.Application;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIOutput;
 import javax.faces.component.UIViewRoot;
@@ -47,10 +44,7 @@ import junit.framework.TestCase;
 
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.test.TestRunnable;
-import org.apache.myfaces.test.el.MockELContext;
 import org.apache.myfaces.test.mock.MockFacesContext12;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
diff --git a/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
index 3ca420c..51f7d12 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
@@ -18,11 +18,8 @@
  */
 package org.apache.myfaces.application;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import java.net.URI;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 import org.junit.Assert;
 import org.junit.Test;
@@ -32,7 +29,6 @@ import java.net.URL;
 import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.myfaces.shared.resource.ExternalContextResourceLoader;
 import org.apache.myfaces.shared.resource.ResourceLoader;
 import org.apache.myfaces.shared.resource.ResourceMeta;
 import org.apache.myfaces.shared.resource.ResourceMetaImpl;
diff --git a/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java b/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
index e511793..3dbfd00 100644
--- a/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
@@ -24,16 +24,7 @@ import org.apache.myfaces.config.element.Application;
 import org.apache.myfaces.config.element.ContractMapping;
 import org.apache.myfaces.config.element.FacesConfig;
 import org.apache.myfaces.config.element.FacesConfigNameSlot;
-import org.apache.myfaces.config.element.FacesFlowCall;
-import org.apache.myfaces.config.element.FacesFlowDefinition;
-import org.apache.myfaces.config.element.FacesFlowMethodCall;
-import org.apache.myfaces.config.element.FacesFlowParameter;
-import org.apache.myfaces.config.element.FacesFlowReturn;
-import org.apache.myfaces.config.element.FacesFlowSwitch;
-import org.apache.myfaces.config.element.FacesFlowView;
 import org.apache.myfaces.config.element.LocaleConfig;
-import org.apache.myfaces.config.element.NavigationCase;
-import org.apache.myfaces.config.element.NavigationRule;
 import org.apache.myfaces.config.element.OrderSlot;
 
 /**
diff --git a/impl/src/test/java/org/apache/myfaces/context/servlet/ServletExternalContextImplTest.java b/impl/src/test/java/org/apache/myfaces/context/servlet/ServletExternalContextImplTest.java
index 0bd0929..68a8eac 100644
--- a/impl/src/test/java/org/apache/myfaces/context/servlet/ServletExternalContextImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/servlet/ServletExternalContextImplTest.java
@@ -26,10 +26,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Test cases for ServletExternalContextImpl.
diff --git a/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventNoPssTestCase.java b/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventNoPssTestCase.java
index 5670e9b..ee0cd96 100644
--- a/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventNoPssTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventNoPssTestCase.java
@@ -19,18 +19,6 @@
 package org.apache.myfaces.event;
 
 import javax.faces.application.StateManager;
-import javax.faces.component.UICommand;
-import javax.faces.component.UIViewRoot;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.PhaseId;
-
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
-import org.apache.myfaces.shared.util.WebConfigParamUtils;
-import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-import org.junit.Assert;
-import org.junit.Test;
 
 public class PostAddToViewEventNoPssTestCase extends PostAddToViewEventTestCase
 {
diff --git a/impl/src/test/java/org/apache/myfaces/lifecycle/MyFacesRequestJUnitTestCase.java b/impl/src/test/java/org/apache/myfaces/lifecycle/MyFacesRequestJUnitTestCase.java
index 435971d..bd722e5 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/MyFacesRequestJUnitTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/MyFacesRequestJUnitTestCase.java
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.lifecycle;
 
-import javax.faces.component.UIComponent;
 import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java b/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
index e629f24..54f6182 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
@@ -18,23 +18,17 @@
  */
 package org.apache.myfaces.lifecycle;
 
-import static org.apache.myfaces.Assert.assertException;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.same;
 
-import java.util.HashMap;
 import java.util.Locale;
 
-import javax.faces.application.ViewExpiredException;
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
 import javax.faces.event.PhaseId;
-import javax.faces.event.PostAddToViewEvent;
-import javax.faces.view.ViewDeclarationLanguage;
 
 import org.apache.myfaces.FacesTestCase;
-import org.apache.myfaces.TestRunner;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java b/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
index f2a56fc..7f0c4d2 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
@@ -70,8 +70,6 @@ import org.apache.myfaces.config.impl.digester.elements.FactoryImpl;
 import org.apache.myfaces.lifecycle.LifecycleImpl;
 import org.apache.myfaces.lifecycle.ViewNotFoundException;
 import org.apache.myfaces.mc.test.core.annotation.DeclareFacesConfig;
-import org.apache.myfaces.mc.test.core.annotation.ManagedBeans;
-import org.apache.myfaces.mc.test.core.annotation.PageBean;
 import org.apache.myfaces.mc.test.core.annotation.TestConfig;
 import org.apache.myfaces.mc.test.core.mock.DefaultContext;
 import org.apache.myfaces.mc.test.core.mock.MockInitialContextFactory;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java b/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
index e741549..ed23b13 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
@@ -70,9 +70,7 @@ import org.apache.myfaces.lifecycle.ViewNotFoundException;
 import org.apache.myfaces.mc.test.core.annotation.BeforeJSFInit;
 import org.apache.myfaces.mc.test.core.mock.MockMyFacesViewDeclarationLanguageFactory;
 import org.apache.myfaces.mc.test.core.annotation.DeclareFacesConfig;
-import org.apache.myfaces.mc.test.core.annotation.ManagedBeans;
 import org.apache.myfaces.mc.test.core.annotation.TestConfig;
-import org.apache.myfaces.mc.test.core.annotation.PageBean;
 import org.apache.myfaces.mc.test.core.annotation.SetupWebConfigParams;
 import org.apache.myfaces.mc.test.core.annotation.TestServletListeners;
 import org.apache.myfaces.mc.test.core.mock.DefaultContext;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
index 1ac4490..d0a655e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
@@ -24,7 +24,6 @@ import java.io.StringWriter;
 import javax.el.ValueExpression;
 import javax.faces.component.UIViewRoot;
 import javax.faces.component.html.HtmlOutputText;
-import javax.validation.constraints.AssertTrue;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
index c49e2e0..40dbd81 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
@@ -21,13 +21,10 @@ package org.apache.myfaces.renderkit.html;
 import java.io.IOException;
 import java.io.StringWriter;
 import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
 
 import javax.faces.component.behavior.AjaxBehavior;
 import javax.faces.component.html.HtmlOutputLabel;
 
-import org.apache.myfaces.application.ApplicationImpl;
-import org.apache.myfaces.application.ApplicationImplJsfTest;
 
 import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMockTestCase;
 import org.apache.myfaces.test.mock.MockRenderKitFactory;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
index 5c2fb42..a7d08ff 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
@@ -31,14 +31,9 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared.config.MyfacesConfig;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
-import org.apache.myfaces.test.mock.MockExternalContext;
-import org.apache.myfaces.test.mock.MockHttpServletRequest;
-import org.apache.myfaces.test.mock.MockHttpServletResponse;
 import org.apache.myfaces.test.mock.MockRenderKitFactory;
 import org.apache.myfaces.test.mock.MockResponseWriter;
-import org.apache.myfaces.test.mock.MockServletContext;
 import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
 import org.apache.myfaces.test.utils.HtmlRenderedAttr;
 
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRolePassedThroughTestCase.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRolePassedThroughTestCase.java
index b58a9a6..5e01a0a 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRolePassedThroughTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRolePassedThroughTestCase.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.renderkit.html;
 import java.io.StringWriter;
 
 import javax.el.ExpressionFactory;
-import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
 
 import junit.framework.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java
index b5d772b..0c72291 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlSelectManyCheckboxClientBehaviorRendererTest.java
@@ -20,13 +20,11 @@ package org.apache.myfaces.renderkit.html.behavior;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UISelectItem;
-import javax.faces.component.UIViewRoot;
 import javax.faces.component.behavior.AjaxBehavior;
 import javax.faces.component.behavior.ClientBehaviorHolder;
 import javax.faces.component.html.HtmlSelectManyCheckbox;
 
 import org.junit.Assert;
-import org.junit.Test;
 
 /**
  * @author Leonardo Uribe (latest modification by $Author$)
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
index a8cedb8..96437aa 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
@@ -39,9 +39,7 @@ import javax.faces.event.ValueChangeEvent;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
-import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.easymock.classextension.EasyMock;
 import org.junit.Test;
 import org.testng.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
index a67b529..5cf19b6 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
@@ -33,8 +33,6 @@ import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.component.html.HtmlSelectOneMenu;
 
 import junit.framework.Assert;
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
 
 import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
 import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
index e858b57..7518e11 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
@@ -38,7 +38,6 @@ import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
 import org.apache.myfaces.test.mock.MockFacesContext20;
 import org.apache.myfaces.test.mock.MockRenderKit;
 import org.apache.myfaces.view.facelets.FaceletMultipleRequestsTestCase;
-import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
 import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
 import org.junit.Test;
 import org.testng.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java b/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
index 92d6398..c7aa0d6 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
@@ -25,14 +25,11 @@ import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.application.StateManager;
-import javax.faces.component.UIColumn;
 import javax.faces.component.UIData;
 import javax.faces.component.UIDataTest.RowData;
 import javax.faces.component.UIInput;
 import javax.faces.component.UIViewRoot;
 import javax.faces.event.PhaseId;
-import javax.faces.render.Renderer;
 import static junit.framework.TestCase.assertEquals;
 
 import org.apache.myfaces.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/el/CacheELExpressionsTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/el/CacheELExpressionsTestCase.java
index 6a75834..8b2a25c 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/el/CacheELExpressionsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/el/CacheELExpressionsTestCase.java
@@ -20,7 +20,6 @@ package org.apache.myfaces.view.facelets.el;
 
 import java.io.StringWriter;
 import javax.el.ExpressionFactory;
-import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.view.facelets.ELExpressionCacheMode;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java
index e7155a5..9e3b5cf 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java
@@ -27,8 +27,6 @@ import javax.el.ExpressionFactory;
 import javax.el.ValueExpression;
 import javax.faces.view.Location;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.apache.myfaces.view.facelets.tag.TagAttributeImpl;
 import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletInputStream.java b/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletInputStream.java
index 5a57bab..6c0d15b 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletInputStream.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletInputStream.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
 import javax.servlet.ReadListener;
 
 import javax.servlet.ServletInputStream;
-import javax.servlet.WriteListener;
 
 /**
  * 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidARCacheELMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidARCacheELMyFacesRequestTestCase.java
index ef04e71..c8d8c92 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidARCacheELMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidARCacheELMyFacesRequestTestCase.java
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.view.facelets.pss.acid;
 
-import javax.faces.application.StateManager;
 import org.apache.myfaces.view.facelets.impl.FaceletCompositionContextImpl;
 
 public class AcidARCacheELMyFacesRequestTestCase extends AcidMyFacesRequestTestCase
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleComponentVDL.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleComponentVDL.java
index 4f4ddba..2e1c4cc 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleComponentVDL.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleComponentVDL.java
@@ -24,7 +24,6 @@ import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
 import javax.faces.component.UIViewRoot;
-import javax.faces.component.html.HtmlOutputText;
 import javax.faces.context.FacesContext;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.PreRenderViewEvent;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java
index 9b53c88..bb377b1 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java
@@ -25,8 +25,6 @@ import javax.faces.component.UINamingContainer;
 import javax.faces.component.UIViewRoot;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java
index 6e40da9..5813b0a 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java
@@ -25,8 +25,6 @@ import javax.el.ExpressionFactory;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.apache.myfaces.view.facelets.bean.HelloWorld;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java
index 29d7a01..174569c 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java
@@ -25,8 +25,6 @@ import javax.faces.component.UIComponent;
 import javax.faces.component.UINamingContainer;
 import javax.faces.component.UIViewRoot;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.apache.myfaces.view.facelets.bean.HelloWorld;
 import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java
index 42adda7..b78a244 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java
@@ -25,8 +25,6 @@ import javax.faces.component.UIComponent;
 import javax.faces.component.UINamingContainer;
 import javax.faces.component.UIViewRoot;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java
index da16fb0..8f52358 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java
@@ -24,8 +24,6 @@ import javax.faces.component.UIInput;
 import javax.faces.component.UINamingContainer;
 import javax.faces.component.UIViewRoot;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java
index 7a41e1b..a3a60c4 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java
@@ -25,8 +25,6 @@ import javax.faces.component.UINamingContainer;
 import javax.faces.component.UIViewRoot;
 import javax.faces.event.ValueChangeEvent;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/reset/ResetValuesTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/reset/ResetValuesTestCase.java
index 26056cb..8e1dc65 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/reset/ResetValuesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/reset/ResetValuesTestCase.java
@@ -20,7 +20,6 @@ package org.apache.myfaces.view.facelets.tag.jsf.core.reset;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
-import javax.faces.component.UIViewRoot;
 import junit.framework.Assert;
 import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreTestCase.java
index 188b986..5d891ac 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreTestCase.java
@@ -43,7 +43,6 @@ import org.apache.myfaces.view.facelets.ELExpressionCacheMode;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
 import org.apache.myfaces.view.facelets.bean.Employee;
 import org.apache.myfaces.view.facelets.impl.FaceletCompositionContextImpl;
-import org.apache.myfaces.view.facelets.util.FastWriter;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
index 82dfc7d..2f0ad32 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
@@ -27,14 +27,10 @@ import javax.faces.component.UIViewRoot;
 import javax.faces.component.html.HtmlOutputText;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.renderkit.html.HtmlCompositeComponentRenderer;
 import org.apache.myfaces.renderkit.html.HtmlCompositeFacetRenderer;
 import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
-import org.apache.myfaces.test.mock.MockExternalContext;
-import org.apache.myfaces.view.facelets.ELExpressionCacheMode;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
-import org.apache.myfaces.view.facelets.impl.FaceletCompositionContextImpl;
 import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
 import org.apache.myfaces.view.facelets.util.FastWriter;
 import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java
index ddb6bfa..d34fb69 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java
@@ -25,12 +25,9 @@ import javax.faces.component.UIViewRoot;
 import javax.faces.component.html.HtmlOutputText;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
-import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
-import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
 import org.apache.myfaces.view.facelets.util.FastWriter;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/CompositionTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/CompositionTestCase.java
index 0eec2bf..dfaa08b 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/CompositionTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/CompositionTestCase.java
@@ -25,7 +25,6 @@ import javax.faces.component.UIViewRoot;
 
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
-import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/IncludeTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/IncludeTestCase.java
index 8a3a08b..61b37c9 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/IncludeTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/IncludeTestCase.java
@@ -25,7 +25,6 @@ import javax.faces.component.UIViewRoot;
 
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
-import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/UserTagTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/UserTagTestCase.java
index 66cdef7..15bbedc 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/UserTagTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/template/UserTagTestCase.java
@@ -25,7 +25,6 @@ import javax.faces.component.UIViewRoot;
 
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.view.facelets.FaceletTestCase;
-import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
index 8b73cc0..3194b8b 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
@@ -23,7 +23,6 @@ import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
 import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
 
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
 import org.apache.myfaces.shared.config.MyfacesConfig;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/shared-public/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java b/shared-public/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
index 02b3e40..3419ce3 100644
--- a/shared-public/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
+++ b/shared-public/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
@@ -20,7 +20,6 @@ import java.util.ResourceBundle;
 
 import javax.faces.application.FacesMessage;
 
-import junit.framework.Test;
 import org.apache.myfaces.shared.util.MessageUtils;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
diff --git a/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java b/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java
index d5b808c..cccce5e 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java
@@ -16,13 +16,8 @@
 
 package org.apache.myfaces.shared.renderkit.html.util;
 
-import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
index b7efa8b..fab9453 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
@@ -20,8 +20,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 /**
  * <p>This TestCase uses the Advanced Encryption Standard with
  * Cipher Block Chaining mode and PKCS5 padding.</p>
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
index 7809c4a..74621e2 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
@@ -20,8 +20,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 public class CachedStateUtilsBlowfish_ECBTest extends AbstractStateUtilsTest
 {
 
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
index 7312051..3b48316 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
@@ -20,8 +20,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 public class CachedStateUtilsDefaultTest extends AbstractStateUtilsTest
 {
 
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
index db36ac4..a1c2fe4 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
@@ -20,8 +20,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 public class CachedStateUtilsTripleDES_ECBTest extends AbstractStateUtilsTest
 {
 
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java b/shared/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
index 1f63b01..9696831 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
@@ -17,7 +17,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 import javax.faces.FacesException;
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
index 02b3e40..3419ce3 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
@@ -20,7 +20,6 @@ import java.util.ResourceBundle;
 
 import javax.faces.application.FacesMessage;
 
-import junit.framework.Test;
 import org.apache.myfaces.shared.util.MessageUtils;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
index 150246f..cf25ece 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 import javax.crypto.SecretKey;
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
index d842da9..2a23b1e 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 public class SecretKeyConfigurationTest extends AbstractJsfTestCase
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
index 5a4772b..05fe6e7 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 /**
  * <p>This TestCase uses the Advanced Encryption Standard with
  * Cipher Block Chaining mode and PKCS5 padding.</p>
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
index b39e587..7de28da 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 /**
  * This TestCase uses Blowfish in Electronic CodeBook mode
  * with PKCS5 padding.
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
index 19d0e48..78c078a 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 /**
  * This TestCase uses the the default algorithm/mode/padding of
  * StateUtils.
diff --git a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
index 438c112..a487e2f 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.shared.util;
 
-import junit.framework.Test;
-
 /**
  * This TestCase uses the 3DES algorithm in Electronic CodeBook mode
  * with PKCS5 padding.