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/20 18:11:19 UTC
[myfaces] 03/03: renamed packages
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
commit bf15be6fc80e51fcd2a0bb1379d8f86df91e46ae
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sat Oct 20 20:11:11 2018 +0200
renamed packages
---
.../test/java/javax/faces/FactoryFinderTest.java | 4 +-
.../javax/faces/application/ViewHandlerTest.java | 4 +-
.../faces/component/UIComponentEncodeAllTest.java | 4 +-
.../UIComponentInvokeOnComponentTest.java | 10 ++--
.../javax/faces/component/UIComponentTest.java | 4 +-
.../java/javax/faces/component/UIDataTest.java | 6 +--
.../java/javax/faces/component/UIInputTest.java | 2 +-
.../java/javax/faces/component/UIViewRootTest.java | 2 +-
.../javax/faces/component/_ComponentUtilsTest.java | 2 +-
.../myfaces/application/ApplicationImplTest.java | 4 +-
...tractsCreateResourceMyFacesRequestTestCase.java | 2 +-
...faultContractsConfigMyFacesRequestTestCase.java | 2 +-
.../SingleContractMyFacesRequestTestCase.java | 2 +-
.../flow/FlowMyFacesCDIRequestTestCase.java | 2 +-
.../flow/FlowMyFacesRequestTestCase.java | 2 +-
.../FlowResourceHandlerMyFacesRequestTestCase.java | 2 +-
.../bean/DynamicManagedPropertyProducerTest.java | 2 +-
.../component/search/SearchExpressionImplTest.java | 2 +-
.../ClassElementTestCase.java} | 17 ++++---
.../myfaces/event/PostAddToViewEventTestCase.java | 2 +-
.../lifecycle/DefaultRestoreViewSupportTest.java | 6 +--
.../lifecycle/MyFacesRequestJUnitTestCase.java | 2 +-
.../lifecycle/PhaseListenerOrderingTest.java | 8 +--
.../myfaces/lifecycle/RestoreViewExecutorTest.java | 2 +-
.../myfaces/taglib/html/HtmlFormTagTest.java | 57 ----------------------
.../apache/myfaces/{ => test}/FacesTestCase.java | 2 +-
.../myfaces/test/ImplClassElementTestCase.java | 35 -------------
.../apache/myfaces/{ => test}/MyFacesAsserts.java | 2 +-
.../org/apache/myfaces/{ => test}/TestRunner.java | 2 +-
.../core/AbstractMyFacesCDIRequestTestCase.java | 2 +-
.../test/core/AbstractMyFacesFaceletsTestCase.java | 4 +-
.../test/core/AbstractMyFacesRequestTestCase.java | 6 +--
.../test/core/AbstractMyFacesTestCase.java | 12 ++---
.../test/core/annotation/AfterRequest.java | 2 +-
.../test/core/annotation/BeforeJSFInit.java | 2 +-
.../test/core/annotation/BeforeRequest.java | 2 +-
.../test/core/annotation/DeclareFacesConfig.java | 2 +-
.../test/core/annotation/SetupWebConfigParams.java | 2 +-
.../{mc => }/test/core/annotation/TestConfig.java | 2 +-
.../test/core/annotation/TestContainer.java | 2 +-
.../test/core/annotation/TestServletListeners.java | 2 +-
.../{mc => }/test/core/mock/DefaultContext.java | 2 +-
.../mock/MockDefaultViewDeclarationLanguage.java | 2 +-
...MockDefaultViewDeclarationLanguageStrategy.java | 2 +-
.../test/core/mock/MockInitialContext.java | 2 +-
.../test/core/mock/MockInitialContextFactory.java | 2 +-
.../{mc => }/test/core/mock/MockMyFacesClient.java | 4 +-
.../MockMyFacesFaceletViewDeclarationLanguage.java | 2 +-
...acesFaceletViewDeclarationLanguageStrategy.java | 2 +-
.../MockMyFacesViewDeclarationLanguageFactory.java | 2 +-
.../{mc => }/test/core/mock/NameParserImpl.java | 2 +-
.../test/core/mock/ServletMockContainer.java | 2 +-
.../runner/AbstractJsfRequestTestContainer.java | 12 ++---
.../test/core/runner/AbstractJsfTestContainer.java | 18 +++----
.../test/core/runner/MyFacesContainer.java | 2 +-
.../test/core/runner/MyFacesTestRunner.java | 4 +-
.../{ => test}/mock/ExceptionMockRunner.java | 2 +-
.../mock/MockRenderedValueExpression.java | 2 +-
.../apache/myfaces/{ => test}/mock/MockRunner.java | 4 +-
.../mock/api/Mock2ApplicationFactory.java | 2 +-
.../mock/api/MockApplicationFactory.java | 2 +-
.../facelets/TemplateInResourcesDirTestCase.java | 2 +-
.../view/facelets/component/UIRepeatTest.java | 4 +-
.../pool/ViewPoolMyFacesRequestTestCase.java | 2 +-
.../pss/acid/AcidMyFacesRequestTestCase.java | 2 +-
.../LocalizedCompositeComponentTestCase.java | 4 +-
.../tag/jsf/core/reset/ResetValuesTestCase.java | 2 +-
.../BeanValidationCDIRequestTestCase.java | 2 +-
...sComponentAnnotationMyFacesRequestTestCase.java | 2 +-
.../UpdateHeadDynamicViewTestCase.java | 2 +-
70 files changed, 120 insertions(+), 207 deletions(-)
diff --git a/impl/src/test/java/javax/faces/FactoryFinderTest.java b/impl/src/test/java/javax/faces/FactoryFinderTest.java
index d692f59..6b2cb36 100644
--- a/impl/src/test/java/javax/faces/FactoryFinderTest.java
+++ b/impl/src/test/java/javax/faces/FactoryFinderTest.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Field;
import java.util.List;
import java.util.Map;
-import org.apache.myfaces.mock.api.Mock2ApplicationFactory;
-import org.apache.myfaces.mock.api.MockApplicationFactory;
+import org.apache.myfaces.test.mock.api.Mock2ApplicationFactory;
+import org.apache.myfaces.test.mock.api.MockApplicationFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/impl/src/test/java/javax/faces/application/ViewHandlerTest.java b/impl/src/test/java/javax/faces/application/ViewHandlerTest.java
index 02fbb8f..b14e8f7 100644
--- a/impl/src/test/java/javax/faces/application/ViewHandlerTest.java
+++ b/impl/src/test/java/javax/faces/application/ViewHandlerTest.java
@@ -34,8 +34,8 @@ import javax.faces.context.FacesContext;
import junit.framework.TestCase;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.mock.MockFacesContext12;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
diff --git a/impl/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java b/impl/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
index 62f7766..97162ac 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
@@ -24,8 +24,8 @@ import java.util.Collection;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
diff --git a/impl/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java b/impl/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
index d17f4af..3cb7050 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
@@ -83,7 +83,7 @@ public class UIComponentInvokeOnComponentTest extends AbstractJsfTestCase
EasyMock.expectLastCall().andThrow(new RuntimeException());
_mocksControl.replay();
- org.apache.myfaces.MyFacesAsserts.assertException(FacesException.class, new TestRunner()
+ org.apache.myfaces.test.MyFacesAsserts.assertException(FacesException.class, new TestRunner()
{
public void run() throws Throwable
{
@@ -127,21 +127,21 @@ public class UIComponentInvokeOnComponentTest extends AbstractJsfTestCase
@Test
public void testInvokeOnComponentExceptions() throws Exception
{
- org.apache.myfaces.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
+ org.apache.myfaces.test.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
{
public void run() throws Throwable
{
_testimpl.invokeOnComponent(null, "xxx", _contextCallback);
}
});
- org.apache.myfaces.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
+ org.apache.myfaces.test.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
{
public void run() throws Throwable
{
_testimpl.invokeOnComponent(facesContext, null, _contextCallback);
}
});
- org.apache.myfaces.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
+ org.apache.myfaces.test.MyFacesAsserts.assertException(NullPointerException.class, new TestRunner()
{
public void run() throws Throwable
{
diff --git a/impl/src/test/java/javax/faces/component/UIComponentTest.java b/impl/src/test/java/javax/faces/component/UIComponentTest.java
index f915ba7..5a76328 100644
--- a/impl/src/test/java/javax/faces/component/UIComponentTest.java
+++ b/impl/src/test/java/javax/faces/component/UIComponentTest.java
@@ -28,8 +28,8 @@ import java.util.HashMap;
import java.util.Map;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.TestRunner;
import org.junit.Test;
public class UIComponentTest extends UIComponentTestBase
diff --git a/impl/src/test/java/javax/faces/component/UIDataTest.java b/impl/src/test/java/javax/faces/component/UIDataTest.java
index 33e9444..055d473 100644
--- a/impl/src/test/java/javax/faces/component/UIDataTest.java
+++ b/impl/src/test/java/javax/faces/component/UIDataTest.java
@@ -44,9 +44,9 @@ import javax.faces.event.PhaseId;
import javax.faces.render.Renderer;
import static junit.framework.TestCase.assertEquals;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.TestRunner;
-import org.apache.myfaces.mock.MockRenderedValueExpression;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.TestRunner;
+import org.apache.myfaces.test.mock.MockRenderedValueExpression;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.visit.MockVisitContext;
import org.easymock.classextension.EasyMock;
diff --git a/impl/src/test/java/javax/faces/component/UIInputTest.java b/impl/src/test/java/javax/faces/component/UIInputTest.java
index 61dedc9..913b6f4 100644
--- a/impl/src/test/java/javax/faces/component/UIInputTest.java
+++ b/impl/src/test/java/javax/faces/component/UIInputTest.java
@@ -44,7 +44,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.myfaces.mock.MockRenderedValueExpression;
+import org.apache.myfaces.test.mock.MockRenderedValueExpression;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
import org.apache.myfaces.test.mock.visit.MockVisitCallback;
diff --git a/impl/src/test/java/javax/faces/component/UIViewRootTest.java b/impl/src/test/java/javax/faces/component/UIViewRootTest.java
index 2144b6d..b0f41c6 100644
--- a/impl/src/test/java/javax/faces/component/UIViewRootTest.java
+++ b/impl/src/test/java/javax/faces/component/UIViewRootTest.java
@@ -50,7 +50,7 @@ import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.webapp.FacesServlet;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockFacesContext12;
import org.easymock.classextension.EasyMock;
diff --git a/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java b/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
index d8064f0..dd83a99 100644
--- a/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
+++ b/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.myfaces.mock.MockRenderedValueExpression;
+import org.apache.myfaces.test.mock.MockRenderedValueExpression;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Test;
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 4fccbb5..aaa2e05 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
@@ -40,8 +40,8 @@ import javax.faces.convert.ConverterException;
import javax.faces.convert.EnumConverter;
import junit.framework.TestCase;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.test.mock.MockFacesContext12;
diff --git a/impl/src/test/java/org/apache/myfaces/application/contracts/ContractsCreateResourceMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/application/contracts/ContractsCreateResourceMyFacesRequestTestCase.java
index 3b24e94..9582069 100644
--- a/impl/src/test/java/org/apache/myfaces/application/contracts/ContractsCreateResourceMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/contracts/ContractsCreateResourceMyFacesRequestTestCase.java
@@ -27,7 +27,7 @@ import javax.faces.application.ViewResource;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/application/contracts/DefaultContractsConfigMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/application/contracts/DefaultContractsConfigMyFacesRequestTestCase.java
index 0267528..7d3f759 100644
--- a/impl/src/test/java/org/apache/myfaces/application/contracts/DefaultContractsConfigMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/contracts/DefaultContractsConfigMyFacesRequestTestCase.java
@@ -25,7 +25,7 @@ import javax.faces.application.StateManager;
import org.junit.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/application/contracts/SingleContractMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/application/contracts/SingleContractMyFacesRequestTestCase.java
index 3808349..b8ef4b7 100644
--- a/impl/src/test/java/org/apache/myfaces/application/contracts/SingleContractMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/contracts/SingleContractMyFacesRequestTestCase.java
@@ -30,7 +30,7 @@ import javax.faces.component.UICommand;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.test.mock.MockPrintWriter;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesCDIRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesCDIRequestTestCase.java
index 8386224..e4236c6 100644
--- a/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesCDIRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesCDIRequestTestCase.java
@@ -24,7 +24,7 @@ import javax.faces.application.NavigationCase;
import javax.faces.application.StateManager;
import javax.faces.component.UICommand;
import javax.faces.flow.Flow;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesRequestTestCase.java
index d0cc8cd..19973f0 100644
--- a/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/flow/FlowMyFacesRequestTestCase.java
@@ -26,7 +26,7 @@ import javax.faces.component.UICommand;
import javax.faces.flow.Flow;
import javax.faces.flow.FlowHandler;
import javax.faces.render.ResponseStateManager;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/application/flow/FlowResourceHandlerMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/application/flow/FlowResourceHandlerMyFacesRequestTestCase.java
index 6b11a57..7411bb3 100644
--- a/impl/src/test/java/org/apache/myfaces/application/flow/FlowResourceHandlerMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/flow/FlowResourceHandlerMyFacesRequestTestCase.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.application.flow;
import java.util.Iterator;
import java.util.stream.Stream;
import javax.faces.application.StateManager;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.resource.ClassLoaderResourceLoader;
import org.apache.myfaces.shared.resource.ExternalContextResourceLoader;
diff --git a/impl/src/test/java/org/apache/myfaces/cdi/bean/DynamicManagedPropertyProducerTest.java b/impl/src/test/java/org/apache/myfaces/cdi/bean/DynamicManagedPropertyProducerTest.java
index 1de2e2f..626a4d8 100644
--- a/impl/src/test/java/org/apache/myfaces/cdi/bean/DynamicManagedPropertyProducerTest.java
+++ b/impl/src/test/java/org/apache/myfaces/cdi/bean/DynamicManagedPropertyProducerTest.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.cdi.bean;
import javax.el.ExpressionFactory;
import javax.faces.component.UIOutput;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/component/search/SearchExpressionImplTest.java b/impl/src/test/java/org/apache/myfaces/component/search/SearchExpressionImplTest.java
index 614606a..9108839 100644
--- a/impl/src/test/java/org/apache/myfaces/component/search/SearchExpressionImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/component/search/SearchExpressionImplTest.java
@@ -33,7 +33,7 @@ import javax.faces.component.search.SearchExpressionContext;
import javax.faces.component.search.SearchExpressionHandler;
import javax.faces.component.search.SearchExpressionHint;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java b/impl/src/test/java/org/apache/myfaces/config/ClassElementTestCase.java
similarity index 88%
rename from impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
rename to impl/src/test/java/org/apache/myfaces/config/ClassElementTestCase.java
index 18f8f5d..dd3d81b 100644
--- a/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/ClassElementTestCase.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.test;
+package org.apache.myfaces.config;
import java.io.InputStream;
import java.util.ArrayList;
@@ -36,16 +36,20 @@ import org.junit.Test;
* @see ClassElementHandler
* @author Dennis Byrne
*/
-
-public abstract class AbstractClassElementTestCase
+public class ClassElementTestCase
{
-
- //private Log log = LogFactory.getLog(AbstractClassElementTestCase.class);
- private Logger log = Logger.getLogger(AbstractClassElementTestCase.class.getName());
+ private Logger log = Logger.getLogger(ClassElementTestCase.class.getName());
protected List<String> resource = new ArrayList<String>();
private List<String> className = new ArrayList<String>();
+ public ClassElementTestCase()
+ {
+ resource.add("META-INF/myfaces_core.tld");
+ resource.add("META-INF/myfaces_html.tld");
+ resource.add("META-INF/standard-faces-config.xml");
+ }
+
@Before
protected void setUp() throws Exception
{
@@ -103,4 +107,5 @@ public abstract class AbstractClassElementTestCase
log.fine((i + 1) + " class found ");
}
+
}
diff --git a/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventTestCase.java b/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventTestCase.java
index d66a1d2..f075326 100644
--- a/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/event/PostAddToViewEventTestCase.java
@@ -26,7 +26,7 @@ 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.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
import org.easymock.EasyMock;
diff --git a/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java b/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java
index 1fb1490..2d89d7f 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java
@@ -26,9 +26,9 @@ import java.util.Map;
import javax.faces.FacesException;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.FacesTestCase;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.FacesTestCase;
+import org.apache.myfaces.test.TestRunner;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
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 bd722e5..23e5b6f 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,7 @@
*/
package org.apache.myfaces.lifecycle;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/lifecycle/PhaseListenerOrderingTest.java b/impl/src/test/java/org/apache/myfaces/lifecycle/PhaseListenerOrderingTest.java
index 3301826..5c4f5c9 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/PhaseListenerOrderingTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/PhaseListenerOrderingTest.java
@@ -20,10 +20,10 @@
package org.apache.myfaces.lifecycle;
import java.util.List;
-import org.apache.myfaces.mc.test.core.annotation.DeclareFacesConfig;
-import org.apache.myfaces.mc.test.core.annotation.TestContainer;
-import org.apache.myfaces.mc.test.core.runner.MyFacesContainer;
-import org.apache.myfaces.mc.test.core.runner.MyFacesTestRunner;
+import org.apache.myfaces.test.core.annotation.DeclareFacesConfig;
+import org.apache.myfaces.test.core.annotation.TestContainer;
+import org.apache.myfaces.test.core.runner.MyFacesContainer;
+import org.apache.myfaces.test.core.runner.MyFacesTestRunner;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
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 54f6182..202e14e 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
@@ -28,7 +28,7 @@ import javax.faces.application.ViewHandler;
import javax.faces.component.UIViewRoot;
import javax.faces.event.PhaseId;
-import org.apache.myfaces.FacesTestCase;
+import org.apache.myfaces.test.FacesTestCase;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
diff --git a/impl/src/test/java/org/apache/myfaces/taglib/html/HtmlFormTagTest.java b/impl/src/test/java/org/apache/myfaces/taglib/html/HtmlFormTagTest.java
deleted file mode 100644
index df8cce0..0000000
--- a/impl/src/test/java/org/apache/myfaces/taglib/html/HtmlFormTagTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.taglib.html;
-
-import javax.faces.component.html.HtmlForm;
-
-import org.apache.myfaces.el.LiteralValueExpression;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author Mathias Broekelmann (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class HtmlFormTagTest extends AbstractJsfTestCase
-{
- /**
- * @param name
- */
- public HtmlFormTagTest(String name)
- {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Test
- public void testPrependId() throws Exception
- {
- HtmlFormTag htmlFormTag = new HtmlFormTag();
- htmlFormTag.setPrependId(new LiteralValueExpression(false));
- HtmlForm htmlForm = new HtmlForm();
- htmlFormTag.setProperties(htmlForm);
- Assert.assertEquals(false, htmlForm.isPrependId());
- }
-}
diff --git a/impl/src/test/java/org/apache/myfaces/FacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/FacesTestCase.java
rename to impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
index defd121..62de971 100644
--- a/impl/src/test/java/org/apache/myfaces/FacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/FacesTestCase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces;
+package org.apache.myfaces.test;
import javax.el.ELContext;
import javax.faces.application.Application;
diff --git a/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java b/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java
deleted file mode 100644
index e41733d..0000000
--- a/impl/src/test/java/org/apache/myfaces/test/ImplClassElementTestCase.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.myfaces.test;
-
-/**
- * @author Dennis Byrne
- */
-
-public class ImplClassElementTestCase extends AbstractClassElementTestCase
-{
-
- public ImplClassElementTestCase(){
-
- //resource.add("META-INF/f.tld");
- resource.add("META-INF/myfaces_core.tld");
- resource.add("META-INF/myfaces_html.tld");
- resource.add("META-INF/standard-faces-config.xml");
-
- }
-
-}
diff --git a/impl/src/test/java/org/apache/myfaces/MyFacesAsserts.java b/impl/src/test/java/org/apache/myfaces/test/MyFacesAsserts.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/MyFacesAsserts.java
rename to impl/src/test/java/org/apache/myfaces/test/MyFacesAsserts.java
index 63e702a..ddc8b45 100644
--- a/impl/src/test/java/org/apache/myfaces/MyFacesAsserts.java
+++ b/impl/src/test/java/org/apache/myfaces/test/MyFacesAsserts.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces;
+package org.apache.myfaces.test;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/TestRunner.java b/impl/src/test/java/org/apache/myfaces/test/TestRunner.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/TestRunner.java
rename to impl/src/test/java/org/apache/myfaces/test/TestRunner.java
index ab9de85..49aeb08 100644
--- a/impl/src/test/java/org/apache/myfaces/TestRunner.java
+++ b/impl/src/test/java/org/apache/myfaces/test/TestRunner.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces;
+package org.apache.myfaces.test;
/**
* Implement a testcase which might throw an exception
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesCDIRequestTestCase.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java
rename to impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesCDIRequestTestCase.java
index 4c865b8..0c0f8f8 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesCDIRequestTestCase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core;
+package org.apache.myfaces.test.core;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesFaceletsTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesFaceletsTestCase.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesFaceletsTestCase.java
rename to impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesFaceletsTestCase.java
index e9f9692..457f39a 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesFaceletsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesFaceletsTestCase.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core;
+package org.apache.myfaces.test.core;
-import org.apache.myfaces.mc.test.core.mock.MockMyFacesFaceletViewDeclarationLanguage;
+import org.apache.myfaces.test.core.mock.MockMyFacesFaceletViewDeclarationLanguage;
import javax.faces.FactoryFinder;
import javax.faces.component.UIViewRoot;
import javax.faces.event.PhaseId;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesRequestTestCase.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java
rename to impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesRequestTestCase.java
index 6800578..6d8ffa9 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesRequestTestCase.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core;
+package org.apache.myfaces.test.core;
-import org.apache.myfaces.mc.test.core.mock.MockMyFacesClient;
-import org.apache.myfaces.mc.test.core.mock.ServletMockContainer;
+import org.apache.myfaces.test.core.mock.MockMyFacesClient;
+import org.apache.myfaces.test.core.mock.ServletMockContainer;
import java.io.IOException;
import javax.faces.application.Application;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
rename to impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
index 7f0c4d2..cd414f8 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core;
+package org.apache.myfaces.test.core;
-import org.apache.myfaces.mc.test.core.mock.MockMyFacesViewDeclarationLanguageFactory;
+import org.apache.myfaces.test.core.mock.MockMyFacesViewDeclarationLanguageFactory;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -69,10 +69,10 @@ import org.apache.myfaces.config.element.FacesConfig;
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.TestConfig;
-import org.apache.myfaces.mc.test.core.mock.DefaultContext;
-import org.apache.myfaces.mc.test.core.mock.MockInitialContextFactory;
+import org.apache.myfaces.test.core.annotation.DeclareFacesConfig;
+import org.apache.myfaces.test.core.annotation.TestConfig;
+import org.apache.myfaces.test.core.mock.DefaultContext;
+import org.apache.myfaces.test.core.mock.MockInitialContextFactory;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigurationProvider;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/AfterRequest.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/AfterRequest.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/AfterRequest.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/AfterRequest.java
index bcd2d31..6dc4812 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/AfterRequest.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/AfterRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/BeforeJSFInit.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/BeforeJSFInit.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/BeforeJSFInit.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/BeforeJSFInit.java
index c098dbb..3067e39 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/BeforeJSFInit.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/BeforeJSFInit.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/BeforeRequest.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/BeforeRequest.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/BeforeRequest.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/BeforeRequest.java
index a5c8a58..6e64910 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/BeforeRequest.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/BeforeRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/DeclareFacesConfig.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/DeclareFacesConfig.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/DeclareFacesConfig.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/DeclareFacesConfig.java
index 551a32a..7759ab6 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/DeclareFacesConfig.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/DeclareFacesConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/SetupWebConfigParams.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/SetupWebConfigParams.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/SetupWebConfigParams.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/SetupWebConfigParams.java
index d54bf06..9bf858f 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/SetupWebConfigParams.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/SetupWebConfigParams.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestConfig.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/TestConfig.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestConfig.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/TestConfig.java
index 6a13e96..da6ecd1 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestConfig.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/TestConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/TestContainer.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestContainer.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/TestContainer.java
index f6adb3f..82972e0 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/TestContainer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestServletListeners.java b/impl/src/test/java/org/apache/myfaces/test/core/annotation/TestServletListeners.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestServletListeners.java
rename to impl/src/test/java/org/apache/myfaces/test/core/annotation/TestServletListeners.java
index 5d6587e..11b8e47 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/annotation/TestServletListeners.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/annotation/TestServletListeners.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.annotation;
+package org.apache.myfaces.test.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/DefaultContext.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/DefaultContext.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java
index b7ca5f5..e26096c 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/DefaultContext.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import javax.naming.Binding;
import javax.naming.CompositeName;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockDefaultViewDeclarationLanguage.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockDefaultViewDeclarationLanguage.java
index a45f84d..837b0f1 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockDefaultViewDeclarationLanguage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import java.beans.BeanInfo;
import java.io.IOException;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguageStrategy.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockDefaultViewDeclarationLanguageStrategy.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguageStrategy.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockDefaultViewDeclarationLanguageStrategy.java
index abcc9ef..956aa53 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguageStrategy.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockDefaultViewDeclarationLanguageStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import javax.faces.view.ViewDeclarationLanguage;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockInitialContext.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockInitialContext.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockInitialContext.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockInitialContext.java
index f9aa153..53f087f 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockInitialContext.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockInitialContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import java.util.HashMap;
import java.util.Map;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockInitialContextFactory.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockInitialContextFactory.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockInitialContextFactory.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockInitialContextFactory.java
index 4a5fea4..2efe001 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockInitialContextFactory.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockInitialContextFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import java.util.Hashtable;
import javax.naming.Context;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
index df8f462..ac14638 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import java.util.HashMap;
import java.util.Map;
@@ -37,7 +37,7 @@ import javax.faces.render.ResponseStateManager;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
index c0b6dd3..c6a6ad8 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import java.io.IOException;
import java.util.HashMap;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguageStrategy.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesFaceletViewDeclarationLanguageStrategy.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguageStrategy.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesFaceletViewDeclarationLanguageStrategy.java
index 0d02064..2dbcf05 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguageStrategy.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesFaceletViewDeclarationLanguageStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import java.util.regex.Pattern;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesViewDeclarationLanguageFactory.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesViewDeclarationLanguageFactory.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesViewDeclarationLanguageFactory.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesViewDeclarationLanguageFactory.java
index 0a07854..c074cd3 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesViewDeclarationLanguageFactory.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesViewDeclarationLanguageFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import javax.faces.FacesException;
import javax.faces.view.ViewDeclarationLanguage;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/NameParserImpl.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/NameParserImpl.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/NameParserImpl.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/NameParserImpl.java
index 97d00bb..ac9a523 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/NameParserImpl.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/NameParserImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import javax.naming.CompositeName;
import javax.naming.Name;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/ServletMockContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/ServletMockContainer.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/mock/ServletMockContainer.java
rename to impl/src/test/java/org/apache/myfaces/test/core/mock/ServletMockContainer.java
index a3bd054..3aa63da 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/mock/ServletMockContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/ServletMockContainer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.mc.test.core.mock;
+package org.apache.myfaces.test.core.mock;
import javax.faces.context.FacesContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfRequestTestContainer.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java
rename to impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfRequestTestContainer.java
index 3eb9f6d..53ecd9d 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfRequestTestContainer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.runner;
+package org.apache.myfaces.test.core.runner;
import java.io.IOException;
import java.util.List;
@@ -25,11 +25,11 @@ import javax.faces.application.Application;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.servlet.ServletRequestEvent;
-import org.apache.myfaces.mc.test.core.mock.MockMyFacesClient;
-import org.apache.myfaces.mc.test.core.mock.ServletMockContainer;
-import org.apache.myfaces.mc.test.core.annotation.AfterRequest;
-import org.apache.myfaces.mc.test.core.annotation.BeforeRequest;
-import org.apache.myfaces.mc.test.core.annotation.TestConfig;
+import org.apache.myfaces.test.core.mock.MockMyFacesClient;
+import org.apache.myfaces.test.core.mock.ServletMockContainer;
+import org.apache.myfaces.test.core.annotation.AfterRequest;
+import org.apache.myfaces.test.core.annotation.BeforeRequest;
+import org.apache.myfaces.test.core.annotation.TestConfig;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.apache.myfaces.test.mock.MockHttpServletResponse;
import org.apache.myfaces.test.mock.MockHttpSession;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
rename to impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
index ed23b13..28fef7c 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.runner;
+package org.apache.myfaces.test.core.runner;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -67,14 +67,14 @@ import org.apache.myfaces.config.element.FacesConfig;
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.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.TestConfig;
-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;
-import org.apache.myfaces.mc.test.core.mock.MockInitialContextFactory;
+import org.apache.myfaces.test.core.annotation.BeforeJSFInit;
+import org.apache.myfaces.test.core.mock.MockMyFacesViewDeclarationLanguageFactory;
+import org.apache.myfaces.test.core.annotation.DeclareFacesConfig;
+import org.apache.myfaces.test.core.annotation.TestConfig;
+import org.apache.myfaces.test.core.annotation.SetupWebConfigParams;
+import org.apache.myfaces.test.core.annotation.TestServletListeners;
+import org.apache.myfaces.test.core.mock.DefaultContext;
+import org.apache.myfaces.test.core.mock.MockInitialContextFactory;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigurationProvider;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/MyFacesContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/runner/MyFacesContainer.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/runner/MyFacesContainer.java
rename to impl/src/test/java/org/apache/myfaces/test/core/runner/MyFacesContainer.java
index 3fb2a55..c7f58e0 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/MyFacesContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/runner/MyFacesContainer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.runner;
+package org.apache.myfaces.test.core.runner;
import org.junit.runners.model.TestClass;
diff --git a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/MyFacesTestRunner.java b/impl/src/test/java/org/apache/myfaces/test/core/runner/MyFacesTestRunner.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/mc/test/core/runner/MyFacesTestRunner.java
rename to impl/src/test/java/org/apache/myfaces/test/core/runner/MyFacesTestRunner.java
index 39a4cd3..1d8c83f 100644
--- a/impl/src/test/java/org/apache/myfaces/mc/test/core/runner/MyFacesTestRunner.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/runner/MyFacesTestRunner.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mc.test.core.runner;
+package org.apache.myfaces.test.core.runner;
import java.lang.reflect.Field;
import java.util.List;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.mc.test.core.annotation.TestContainer;
+import org.apache.myfaces.test.core.annotation.TestContainer;
import org.apache.myfaces.spi.InjectionProvider;
import org.apache.myfaces.spi.InjectionProviderFactory;
import org.junit.runners.BlockJUnit4ClassRunner;
diff --git a/impl/src/test/java/org/apache/myfaces/mock/ExceptionMockRunner.java b/impl/src/test/java/org/apache/myfaces/test/mock/ExceptionMockRunner.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mock/ExceptionMockRunner.java
rename to impl/src/test/java/org/apache/myfaces/test/mock/ExceptionMockRunner.java
index 2fb6f73..fa2e025 100644
--- a/impl/src/test/java/org/apache/myfaces/mock/ExceptionMockRunner.java
+++ b/impl/src/test/java/org/apache/myfaces/test/mock/ExceptionMockRunner.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.test.mock;
import org.easymock.classextension.IMocksControl;
diff --git a/impl/src/test/java/org/apache/myfaces/mock/MockRenderedValueExpression.java b/impl/src/test/java/org/apache/myfaces/test/mock/MockRenderedValueExpression.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/mock/MockRenderedValueExpression.java
rename to impl/src/test/java/org/apache/myfaces/test/mock/MockRenderedValueExpression.java
index 4b3ed19..7caf5d4 100644
--- a/impl/src/test/java/org/apache/myfaces/mock/MockRenderedValueExpression.java
+++ b/impl/src/test/java/org/apache/myfaces/test/mock/MockRenderedValueExpression.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.test.mock;
import javax.el.ELContext;
import javax.faces.component.UIComponent;
diff --git a/impl/src/test/java/org/apache/myfaces/mock/MockRunner.java b/impl/src/test/java/org/apache/myfaces/test/mock/MockRunner.java
similarity index 94%
rename from impl/src/test/java/org/apache/myfaces/mock/MockRunner.java
rename to impl/src/test/java/org/apache/myfaces/test/mock/MockRunner.java
index 1185f73..831c7cb 100644
--- a/impl/src/test/java/org/apache/myfaces/mock/MockRunner.java
+++ b/impl/src/test/java/org/apache/myfaces/test/mock/MockRunner.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.test.mock;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.TestRunner;
import org.easymock.classextension.IMocksControl;
public abstract class MockRunner implements TestRunner
diff --git a/impl/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java b/impl/src/test/java/org/apache/myfaces/test/mock/api/Mock2ApplicationFactory.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
rename to impl/src/test/java/org/apache/myfaces/test/mock/api/Mock2ApplicationFactory.java
index b357f22..b30b276 100644
--- a/impl/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
+++ b/impl/src/test/java/org/apache/myfaces/test/mock/api/Mock2ApplicationFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.mock.api;
+package org.apache.myfaces.test.mock.api;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
diff --git a/impl/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java b/impl/src/test/java/org/apache/myfaces/test/mock/api/MockApplicationFactory.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
rename to impl/src/test/java/org/apache/myfaces/test/mock/api/MockApplicationFactory.java
index f964a54..004d23e 100644
--- a/impl/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
+++ b/impl/src/test/java/org/apache/myfaces/test/mock/api/MockApplicationFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.mock.api;
+package org.apache.myfaces.test.mock.api;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/TemplateInResourcesDirTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/TemplateInResourcesDirTestCase.java
index 4a187fe..0237d0e 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/TemplateInResourcesDirTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/TemplateInResourcesDirTestCase.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets;
import javax.el.ExpressionFactory;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.junit.Assert;
import org.junit.Test;
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 fa04f9b..aa782b3 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
@@ -31,8 +31,8 @@ import javax.faces.component.UIInput;
import javax.faces.component.UIViewRoot;
import javax.faces.event.PhaseId;
-import org.apache.myfaces.MyFacesAsserts;
-import org.apache.myfaces.TestRunner;
+import org.apache.myfaces.test.MyFacesAsserts;
+import org.apache.myfaces.test.TestRunner;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pool/ViewPoolMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pool/ViewPoolMyFacesRequestTestCase.java
index 898a483..0e3d2aa 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pool/ViewPoolMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pool/ViewPoolMyFacesRequestTestCase.java
@@ -32,7 +32,7 @@ import javax.faces.component.UIPanel;
import javax.faces.component.UIViewParameter;
import javax.faces.component.UIViewRoot;
import javax.faces.view.ViewMetadata;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.ViewPoolProcessor;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java
index 4ba6fd9..52e2661 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java
@@ -29,7 +29,7 @@ import javax.faces.component.UIOutput;
import javax.faces.component.UIPanel;
import javax.faces.component.UIViewParameter;
import javax.faces.component.html.HtmlDataTable;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.test.mock.MockPrintWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java
index 239512f..0d75ad7 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.view.facelets.tag.composite.localized;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
-import org.apache.myfaces.mc.test.core.annotation.DeclareFacesConfig;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.annotation.DeclareFacesConfig;
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 97843b4..309d726 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
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.tag.jsf.core.reset;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import org.junit.Assert;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.junit.Test;
/**
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/BeanValidationCDIRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/BeanValidationCDIRequestTestCase.java
index 487621c..7d49dbf 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/BeanValidationCDIRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/BeanValidationCDIRequestTestCase.java
@@ -22,7 +22,7 @@ import javax.faces.application.StateManager;
import javax.faces.component.UIInput;
import javax.faces.validator.BeanValidator;
import javax.faces.validator.Validator;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/test/component/FacesComponentAnnotationMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/test/component/FacesComponentAnnotationMyFacesRequestTestCase.java
index c9cfe5b..827c281 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/test/component/FacesComponentAnnotationMyFacesRequestTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/test/component/FacesComponentAnnotationMyFacesRequestTestCase.java
@@ -23,7 +23,7 @@ import javax.faces.application.StateManager;
import javax.faces.component.UIComponent;
import org.junit.Assert;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
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 3194b8b..87cac14 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
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.updateheadres;
import javax.faces.application.StateManager;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
-import org.apache.myfaces.mc.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.junit.Assert;