You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/01/08 16:50:06 UTC
[sling-org-apache-sling-app-cms] branch master updated: Minor -
fixing package for form tests
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new 3cb6b3d Minor - fixing package for form tests
3cb6b3d is described below
commit 3cb6b3db3f1b6b78cad8ee3cd35aefbfe2eea55d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Jan 8 11:49:51 2021 -0500
Minor - fixing package for form tests
---
.../cms/reference/{form => forms}/FormActionResultTest.java | 2 +-
.../cms/reference/{form => forms}/impl/FormHandlerTest.java | 4 +---
.../cms/reference/{form => forms}/impl/FormRequestImplTest.java | 7 +++----
.../cms/reference/{form => forms}/impl/MockMessageBuilder.java | 2 +-
.../cms/reference/{form => forms}/impl/SlingContextHelper.java | 2 +-
.../{form => forms}/impl/actions/SendEmailActionTest.java | 7 +++----
.../{form => forms}/impl/fields/SelectionHandlerTest.java | 9 ++++-----
.../{form => forms}/impl/fields/TextareaHandlerTest.java | 5 ++---
.../{form => forms}/impl/fields/TextfieldHandlerTest.java | 9 ++++-----
9 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/FormActionResultTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/FormActionResultTest.java
similarity index 97%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/FormActionResultTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/FormActionResultTest.java
index d887a0a..9ed86d7 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/FormActionResultTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/FormActionResultTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form;
+package org.apache.sling.cms.reference.forms;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/FormHandlerTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/FormHandlerTest.java
similarity index 96%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/FormHandlerTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/FormHandlerTest.java
index f5d211c..048d08d 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/FormHandlerTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/FormHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl;
+package org.apache.sling.cms.reference.forms.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -32,8 +32,6 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.cms.reference.forms.FormException;
import org.apache.sling.cms.reference.forms.FormRequest;
-import org.apache.sling.cms.reference.forms.impl.FormHandler;
-import org.apache.sling.cms.reference.forms.impl.FormRequestImpl;
import org.apache.sling.cms.reference.forms.impl.actions.SendEmailAction;
import org.apache.sling.cms.reference.forms.impl.fields.SelectionHandler;
import org.apache.sling.cms.reference.forms.impl.fields.TextareaHandler;
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/FormRequestImplTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/FormRequestImplTest.java
similarity index 96%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/FormRequestImplTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/FormRequestImplTest.java
index 9287896..824056d 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/FormRequestImplTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/FormRequestImplTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl;
+package org.apache.sling.cms.reference.forms.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -23,9 +23,10 @@ import static org.junit.Assert.assertTrue;
import java.util.Arrays;
+import com.google.common.collect.ImmutableMap;
+
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.cms.reference.forms.FormException;
-import org.apache.sling.cms.reference.forms.impl.FormRequestImpl;
import org.apache.sling.cms.reference.forms.impl.fields.SelectionHandler;
import org.apache.sling.cms.reference.forms.impl.fields.TextareaHandler;
import org.apache.sling.cms.reference.forms.impl.fields.TextfieldHandler;
@@ -34,8 +35,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import com.google.common.collect.ImmutableMap;
-
public class FormRequestImplTest {
@Rule
public final SlingContext context = new SlingContext();
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/MockMessageBuilder.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
similarity index 98%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/MockMessageBuilder.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
index 689f2d0..f80c497 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/MockMessageBuilder.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/MockMessageBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl;
+package org.apache.sling.cms.reference.forms.impl;
import javax.mail.Header;
import javax.mail.MessagingException;
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/SlingContextHelper.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/SlingContextHelper.java
similarity index 95%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/SlingContextHelper.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/SlingContextHelper.java
index 8dafc09..64c2414 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/SlingContextHelper.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/SlingContextHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl;
+package org.apache.sling.cms.reference.forms.impl;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/actions/SendEmailActionTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailActionTest.java
similarity index 91%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/actions/SendEmailActionTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailActionTest.java
index a6b4ef7..eb4aaf7 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/actions/SendEmailActionTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailActionTest.java
@@ -14,19 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl.actions;
+package org.apache.sling.cms.reference.forms.impl.actions;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.cms.reference.form.impl.MockMessageBuilder;
-import org.apache.sling.cms.reference.form.impl.SlingContextHelper;
import org.apache.sling.cms.reference.forms.FormActionResult;
import org.apache.sling.cms.reference.forms.FormException;
import org.apache.sling.cms.reference.forms.FormRequest;
import org.apache.sling.cms.reference.forms.impl.FormRequestImpl;
-import org.apache.sling.cms.reference.forms.impl.actions.SendEmailAction;
+import org.apache.sling.cms.reference.forms.impl.MockMessageBuilder;
+import org.apache.sling.cms.reference.forms.impl.SlingContextHelper;
import org.apache.sling.commons.messaging.mail.MailService;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/SelectionHandlerTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/SelectionHandlerTest.java
similarity index 95%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/SelectionHandlerTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/SelectionHandlerTest.java
index 6a32227..33baf32 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/SelectionHandlerTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/SelectionHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl.fields;
+package org.apache.sling.cms.reference.forms.impl.fields;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -24,18 +24,17 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.cms.reference.form.impl.SlingContextHelper;
import org.apache.sling.cms.reference.forms.FormException;
-import org.apache.sling.cms.reference.forms.impl.fields.SelectionHandler;
+import org.apache.sling.cms.reference.forms.impl.SlingContextHelper;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import com.google.common.collect.ImmutableMap;
-
public class SelectionHandlerTest {
@Rule
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/TextareaHandlerTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/TextareaHandlerTest.java
similarity index 95%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/TextareaHandlerTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/TextareaHandlerTest.java
index 1429784..3fb6f73 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/TextareaHandlerTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/TextareaHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl.fields;
+package org.apache.sling.cms.reference.forms.impl.fields;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -26,9 +26,8 @@ import java.util.Map;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.cms.reference.form.impl.SlingContextHelper;
import org.apache.sling.cms.reference.forms.FormException;
-import org.apache.sling.cms.reference.forms.impl.fields.TextareaHandler;
+import org.apache.sling.cms.reference.forms.impl.SlingContextHelper;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
diff --git a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/TextfieldHandlerTest.java b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandlerTest.java
similarity index 97%
rename from reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/TextfieldHandlerTest.java
rename to reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandlerTest.java
index 257dc65..3f1afcd 100644
--- a/reference/src/test/java/org/apache/sling/cms/reference/form/impl/fields/TextfieldHandlerTest.java
+++ b/reference/src/test/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.cms.reference.form.impl.fields;
+package org.apache.sling.cms.reference.forms.impl.fields;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -25,18 +25,17 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.cms.reference.form.impl.SlingContextHelper;
import org.apache.sling.cms.reference.forms.FormException;
-import org.apache.sling.cms.reference.forms.impl.fields.TextfieldHandler;
+import org.apache.sling.cms.reference.forms.impl.SlingContextHelper;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import com.google.common.collect.ImmutableMap;
-
public class TextfieldHandlerTest {
@Rule