[sling-org-apache-sling-models-caconfig] branch master updated: cosmetic: split up test example classes in separate packages

[ss...@apache.org]

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-caconfig.git


The following commit(s) were added to refs/heads/master by this push:
     new f538fde  cosmetic: split up test example classes in separate packages
f538fde is described below

commit f538fdefd980403ed7da2e3245c20390f97fabe2
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Jan 3 16:11:09 2022 +0100

    cosmetic: split up test example classes in separate packages
---
 .../{model => invalidmodel}/InvalidAnnotationListModel.java  |  2 +-
 .../{model => invalidmodel}/InvalidAnnotationModel.java      |  2 +-
 .../example/{model => invalidmodel}/InvalidInjectModel.java  |  2 +-
 .../example/{model => invalidmodel}/InvalidSetModel.java     |  2 +-
 .../models/caconfig/example/model/ListConfigAdaptModel.java  |  1 +
 .../sling/models/caconfig/example/model/ListConfigModel.java |  1 +
 .../caconfig/example/model/ListConfigValueMapModel.java      |  1 +
 .../caconfig/example/model/SingleConfigAdaptModel.java       |  1 +
 .../models/caconfig/example/model/SingleConfigModel.java     |  1 +
 .../caconfig/example/model/SingleConfigValueMapModel.java    |  1 +
 .../example/{model => testhelper}/ListConfigGetter.java      |  2 +-
 .../example/{model => testhelper}/SingleConfigGetter.java    |  2 +-
 .../injectors/ContextAwareConfigurationInjectorTest.java     | 12 ++++++------
 13 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidAnnotationListModel.java b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidAnnotationListModel.java
similarity index 95%
rename from src/test/java/org/apache/sling/models/caconfig/example/model/InvalidAnnotationListModel.java
rename to src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidAnnotationListModel.java
index 71f2571..4187fe6 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidAnnotationListModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidAnnotationListModel.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.models.caconfig.example.model;
+package org.apache.sling.models.caconfig.example.invalidmodel;
 
 import java.util.List;
 
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidAnnotationModel.java b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidAnnotationModel.java
similarity index 95%
rename from src/test/java/org/apache/sling/models/caconfig/example/model/InvalidAnnotationModel.java
rename to src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidAnnotationModel.java
index f17ed25..21a0fdb 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidAnnotationModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidAnnotationModel.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.models.caconfig.example.model;
+package org.apache.sling.models.caconfig.example.invalidmodel;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidInjectModel.java b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidInjectModel.java
similarity index 95%
rename from src/test/java/org/apache/sling/models/caconfig/example/model/InvalidInjectModel.java
rename to src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidInjectModel.java
index 3d98300..5c7e832 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidInjectModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidInjectModel.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.models.caconfig.example.model;
+package org.apache.sling.models.caconfig.example.invalidmodel;
 
 import javax.inject.Inject;
 
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidSetModel.java b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidSetModel.java
similarity index 95%
rename from src/test/java/org/apache/sling/models/caconfig/example/model/InvalidSetModel.java
rename to src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidSetModel.java
index 615cdc3..28232dc 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/InvalidSetModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/invalidmodel/InvalidSetModel.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.models.caconfig.example.model;
+package org.apache.sling.models.caconfig.example.invalidmodel;
 
 import java.util.Set;
 
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigAdaptModel.java b/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigAdaptModel.java
index 59838b2..a872973 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigAdaptModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigAdaptModel.java
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.caconfig.annotations.ContextAwareConfiguration;
 import org.apache.sling.models.caconfig.example.caconfig.model.ConfigurationValuesModel;
+import org.apache.sling.models.caconfig.example.testhelper.ListConfigGetter;
 
 @Model(adaptables = { SlingHttpServletRequest.class, Resource.class })
 public class ListConfigAdaptModel implements ListConfigGetter<ConfigurationValuesModel> {
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigModel.java b/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigModel.java
index ecc65df..e8315e5 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigModel.java
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.caconfig.annotations.ContextAwareConfiguration;
 import org.apache.sling.models.caconfig.example.caconfig.ListConfig;
+import org.apache.sling.models.caconfig.example.testhelper.ListConfigGetter;
 
 @Model(adaptables = { SlingHttpServletRequest.class, Resource.class })
 public class ListConfigModel implements ListConfigGetter<ListConfig> {
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigValueMapModel.java b/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigValueMapModel.java
index a83b6c4..e092a0e 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigValueMapModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigValueMapModel.java
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.caconfig.annotations.ContextAwareConfiguration;
+import org.apache.sling.models.caconfig.example.testhelper.ListConfigGetter;
 
 @Model(adaptables = { SlingHttpServletRequest.class, Resource.class })
 public class ListConfigValueMapModel implements ListConfigGetter<ValueMap> {
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigAdaptModel.java b/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigAdaptModel.java
index ccfaf50..504d93a 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigAdaptModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigAdaptModel.java
@@ -23,6 +23,7 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.caconfig.annotations.ContextAwareConfiguration;
 import org.apache.sling.models.caconfig.example.caconfig.model.ConfigurationValuesModel;
+import org.apache.sling.models.caconfig.example.testhelper.SingleConfigGetter;
 
 @Model(adaptables = { SlingHttpServletRequest.class, Resource.class })
 public class SingleConfigAdaptModel implements SingleConfigGetter<ConfigurationValuesModel> {
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigModel.java b/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigModel.java
index 1243232..62cb6ab 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigModel.java
@@ -24,6 +24,7 @@ import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.caconfig.annotations.ContextAwareConfiguration;
 import org.apache.sling.models.caconfig.example.caconfig.SingleConfig;
+import org.apache.sling.models.caconfig.example.testhelper.SingleConfigGetter;
 
 @Model(adaptables = { SlingHttpServletRequest.class, Resource.class, ResourceResolver.class })
 public class SingleConfigModel implements SingleConfigGetter<SingleConfig> {
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigValueMapModel.java b/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigValueMapModel.java
index 10a8939..0c814e3 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigValueMapModel.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigValueMapModel.java
@@ -23,6 +23,7 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.caconfig.annotations.ContextAwareConfiguration;
+import org.apache.sling.models.caconfig.example.testhelper.SingleConfigGetter;
 
 @Model(adaptables = { SlingHttpServletRequest.class, Resource.class })
 public class SingleConfigValueMapModel implements SingleConfigGetter<ValueMap> {
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigGetter.java b/src/test/java/org/apache/sling/models/caconfig/example/testhelper/ListConfigGetter.java
similarity index 94%
rename from src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigGetter.java
rename to src/test/java/org/apache/sling/models/caconfig/example/testhelper/ListConfigGetter.java
index a552c7a..56ef1fa 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/ListConfigGetter.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/testhelper/ListConfigGetter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.models.caconfig.example.model;
+package org.apache.sling.models.caconfig.example.testhelper;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigGetter.java b/src/test/java/org/apache/sling/models/caconfig/example/testhelper/SingleConfigGetter.java
similarity index 93%
rename from src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigGetter.java
rename to src/test/java/org/apache/sling/models/caconfig/example/testhelper/SingleConfigGetter.java
index a69e327..7aaa6a8 100644
--- a/src/test/java/org/apache/sling/models/caconfig/example/model/SingleConfigGetter.java
+++ b/src/test/java/org/apache/sling/models/caconfig/example/testhelper/SingleConfigGetter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.models.caconfig.example.model;
+package org.apache.sling.models.caconfig.example.testhelper;
 
 public interface SingleConfigGetter<T> {
 
diff --git a/src/test/java/org/apache/sling/models/caconfig/impl/injectors/ContextAwareConfigurationInjectorTest.java b/src/test/java/org/apache/sling/models/caconfig/impl/injectors/ContextAwareConfigurationInjectorTest.java
index 26f1e4b..b7e0da6 100644
--- a/src/test/java/org/apache/sling/models/caconfig/impl/injectors/ContextAwareConfigurationInjectorTest.java
+++ b/src/test/java/org/apache/sling/models/caconfig/impl/injectors/ContextAwareConfigurationInjectorTest.java
@@ -35,18 +35,18 @@ import org.apache.sling.caconfig.spi.ConfigurationInjectResourceDetectionStrateg
 import org.apache.sling.models.caconfig.example.caconfig.ListConfig;
 import org.apache.sling.models.caconfig.example.caconfig.SingleConfig;
 import org.apache.sling.models.caconfig.example.caconfig.model.ConfigurationValuesModel;
-import org.apache.sling.models.caconfig.example.model.InvalidAnnotationListModel;
-import org.apache.sling.models.caconfig.example.model.InvalidAnnotationModel;
-import org.apache.sling.models.caconfig.example.model.InvalidInjectModel;
-import org.apache.sling.models.caconfig.example.model.InvalidSetModel;
+import org.apache.sling.models.caconfig.example.invalidmodel.InvalidAnnotationListModel;
+import org.apache.sling.models.caconfig.example.invalidmodel.InvalidAnnotationModel;
+import org.apache.sling.models.caconfig.example.invalidmodel.InvalidInjectModel;
+import org.apache.sling.models.caconfig.example.invalidmodel.InvalidSetModel;
 import org.apache.sling.models.caconfig.example.model.ListConfigAdaptModel;
-import org.apache.sling.models.caconfig.example.model.ListConfigGetter;
 import org.apache.sling.models.caconfig.example.model.ListConfigModel;
 import org.apache.sling.models.caconfig.example.model.ListConfigValueMapModel;
 import org.apache.sling.models.caconfig.example.model.SingleConfigAdaptModel;
-import org.apache.sling.models.caconfig.example.model.SingleConfigGetter;
 import org.apache.sling.models.caconfig.example.model.SingleConfigModel;
 import org.apache.sling.models.caconfig.example.model.SingleConfigValueMapModel;
+import org.apache.sling.models.caconfig.example.testhelper.ListConfigGetter;
+import org.apache.sling.models.caconfig.example.testhelper.SingleConfigGetter;
 import org.apache.sling.testing.mock.caconfig.MockContextAwareConfig;
 import org.apache.sling.testing.mock.sling.junit5.SlingContext;
 import org.apache.sling.testing.mock.sling.junit5.SlingContextBuilder;