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 2019/07/16 15:46:41 UTC
[myfaces] branch master updated: aligned test packages with impl
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 e396f02 aligned test packages with impl
e396f02 is described below
commit e396f0233bc7ab13086ad8de259cff823a09719e
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue Jul 16 17:46:33 2019 +0200
aligned test packages with impl
---
.../{shared/util => application/viewstate}/AbstractStateUtilsTest.java | 2 +-
.../util => application/viewstate}/CachedStateUtilsAES_CBCTest.java | 2 +-
.../viewstate}/CachedStateUtilsBlowfish_ECBTest.java | 2 +-
.../util => application/viewstate}/CachedStateUtilsDefaultTest.java | 2 +-
.../viewstate}/CachedStateUtilsTripleDES_ECBTest.java | 2 +-
.../{shared/util => application/viewstate}/InitVector_CBCTestCase.java | 3 +--
.../{shared/util => application/viewstate}/SecretKeyCacheTest.java | 2 +-
.../util => application/viewstate}/SecretKeyConfigurationTest.java | 2 +-
.../{shared/util => application/viewstate}/StateUtilsAES_CBCTest.java | 2 +-
.../util => application/viewstate}/StateUtilsBlowfish_ECBTest.java | 2 +-
.../{shared/util => application/viewstate}/StateUtilsDefaultTest.java | 2 +-
.../util => application/viewstate}/StateUtilsTripleDES_ECBTest.java | 2 +-
.../apache/myfaces/{shared => }/renderkit/ContentTypeUtilsTest.java | 2 +-
.../org/apache/myfaces/{shared => }/renderkit/RendererUtilsTest.java | 2 +-
.../myfaces/{shared => }/renderkit/html/HtmlRendererUtilsTest.java | 2 +-
.../{shared => }/renderkit/html/HtmlResponseStateManagerTest.java | 2 +-
.../{shared => }/renderkit/html/HtmlResponseWriterImplTest.java | 2 +-
.../myfaces/{shared => }/renderkit/html/util/HTMLEncoderTest.java | 2 +-
.../{shared => }/renderkit/html/util/HTMLEncoderWriterTest.java | 2 +-
.../myfaces/{shared => }/renderkit/html/util/UnicodeEncoderTest.java | 2 +-
.../apache/myfaces/{shared => }/resource/ResourceLoaderUtilsTest.java | 2 +-
.../myfaces/{shared => }/resource/ResourceValidationUtilsTest.java | 2 +-
.../java/org/apache/myfaces/{shared => }/util/CommentUtilsTest.java | 2 +-
.../java/org/apache/myfaces/{shared => }/util/MessageUtilsTest.java | 2 +-
.../org/apache/myfaces/util/{ => lang}/AbstractAttributeMapTest.java | 2 +-
.../myfaces/{shared/util => util/lang}/LRULinkedHashMapTest.java | 3 +--
.../java/org/apache/myfaces/util/{ => lang}/XorShiftRandomTest.java | 2 +-
27 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
index 6181b36..21b730d 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
/**
* This TestCase is not meant to be run, it's children are.
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
index 2244047..4a2957e 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
@@ -18,7 +18,7 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
index b44d0c9..1caa3c5 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
@@ -18,7 +18,7 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
index ee8c020..e636b7d 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
@@ -18,7 +18,7 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java
index 4a60e26..bfec16e 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsTripleDES_ECBTest.java
@@ -18,7 +18,7 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java
similarity index 96%
rename from impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java
index a86fccc..8a1cb91 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/InitVector_CBCTestCase.java
@@ -15,9 +15,8 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import javax.faces.FacesException;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
index 3df8fde..7f5f73c 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
@@ -15,7 +15,7 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java
index bfffecd..9490884 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyConfigurationTest.java
@@ -15,7 +15,7 @@
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
index 963c43d..55a442f 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
index 6d181ef..6f1cc1a 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
index 932e6e6..f49b089 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
rename to impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
index 8f75007..e12e838 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.application.viewstate;
import org.apache.myfaces.application.viewstate.StateUtils;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/ContentTypeUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/ContentTypeUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java
index aa9f6f1..ae86849 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/ContentTypeUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.renderkit;
+package org.apache.myfaces.renderkit;
import org.apache.myfaces.renderkit.ContentTypeUtils;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/RendererUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/RendererUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
index ec85dc9..84d5b14 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/RendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.renderkit;
+package org.apache.myfaces.renderkit;
import org.apache.myfaces.renderkit.RendererUtils;
import java.io.IOException;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRendererUtilsTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRendererUtilsTest.java
index fae50c3..66fb9f8 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRendererUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.renderkit.html;
+package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.renderkit.html.base.HtmlRendererUtils;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseStateManagerTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseStateManagerTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java
index 9696bdb..0cfd52c 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseStateManagerTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManagerTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.renderkit.html;
+package org.apache.myfaces.renderkit.html;
import java.util.HashMap;
import java.util.Map;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImplTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImplTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java
index a79a34c..e6e0926 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.renderkit.html;
+package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
import java.io.IOException;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
index 5f67389..7770304 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.shared.renderkit.html.util;
+package org.apache.myfaces.renderkit.html.util;
import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
import java.io.CharArrayWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderWriterTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
index 708a585..c41a1dd 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderWriterTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.shared.renderkit.html.util;
+package org.apache.myfaces.renderkit.html.util;
import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
import java.io.CharArrayWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java
similarity index 97%
rename from impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoderTest.java
rename to impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java
index 288f98b..514c7f7 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoderTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoderTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.renderkit.html.util;
+package org.apache.myfaces.renderkit.html.util;
import org.apache.myfaces.renderkit.html.util.UnicodeEncoder;
import java.io.StringWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/resource/ResourceLoaderUtilsTest.java b/impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java
similarity index 94%
rename from impl/src/test/java/org/apache/myfaces/shared/resource/ResourceLoaderUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java
index 5fcefca..ef369df 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/resource/ResourceLoaderUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.resource;
+package org.apache.myfaces.resource;
import org.apache.myfaces.resource.ResourceLoaderUtils;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/resource/ResourceValidationUtilsTest.java b/impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/resource/ResourceValidationUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java
index 06098b9..f540dbb 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/resource/ResourceValidationUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.resource;
+package org.apache.myfaces.resource;
import org.apache.myfaces.resource.ResourceValidationUtils;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/CommentUtilsTest.java b/impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/util/CommentUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java
index cf0a021..cbacb98 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/CommentUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/CommentUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.util;
import org.apache.myfaces.util.CommentUtils;
import java.io.IOException;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
rename to impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
index 4834138..2289ec9 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.util;
import java.util.Locale;
import java.util.ResourceBundle;
diff --git a/impl/src/test/java/org/apache/myfaces/util/AbstractAttributeMapTest.java b/impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/util/AbstractAttributeMapTest.java
rename to impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java
index a1357ed..8394581 100644
--- a/impl/src/test/java/org/apache/myfaces/util/AbstractAttributeMapTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.util;
+package org.apache.myfaces.util.lang;
import org.apache.myfaces.util.lang.AbstractAttributeMap;
import java.util.Collections;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/LRULinkedHashMapTest.java b/impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java
similarity index 99%
rename from impl/src/test/java/org/apache/myfaces/shared/util/LRULinkedHashMapTest.java
rename to impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java
index be63dfa..58a23dd 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/LRULinkedHashMapTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/lang/LRULinkedHashMapTest.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.util;
+package org.apache.myfaces.util.lang;
-import org.apache.myfaces.util.lang.LRULinkedHashMap;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/impl/src/test/java/org/apache/myfaces/util/XorShiftRandomTest.java b/impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java
similarity index 98%
rename from impl/src/test/java/org/apache/myfaces/util/XorShiftRandomTest.java
rename to impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java
index be93615..5c31031 100644
--- a/impl/src/test/java/org/apache/myfaces/util/XorShiftRandomTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.util;
+package org.apache.myfaces.util.lang;
import org.apache.myfaces.util.lang.ThreadsafeXorShiftRandom;
import org.apache.myfaces.util.lang.XorShiftRandom;