This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13050-integration-tests-single-pom in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit 56da0906a53238f843f7a1b64b1256ee0d34a668 Author: Stefan Seifert <[email protected]> AuthorDate: Fri Jan 23 16:04:53 2026 +0100 SLING-13050 generate IT test bundle on the fly --- pom.xml | 46 ++++++++++- src/test/it-features/launcher.json | 2 +- .../customizers/SM_TeleporterCustomizer.java | 2 +- .../apache/sling/models/it/GenerateTestBundle.java | 93 ++++++++++++++++++++++ .../testbundle/delegate/request/package-info.java | 21 ----- .../testbundle/delegate/resource/package-info.java | 21 ----- .../viaoriginalresource/models/package-info.java | 21 ----- .../delegate/viaoriginalresource/package-info.java | 21 ----- .../it/testbundle/implpicker/package-info.java | 21 ----- .../testbundle/models/implextend/package-info.java | 21 ----- .../models/it/testbundle/models/package-info.java | 21 ----- .../models/it/testbundle/rtbound/package-info.java | 21 ----- .../it/testbundle/rtboundpicker/package-info.java | 21 ----- .../it/testbundle/services/package-info.java | 21 ----- .../sling/models/it/{ => testing}/DecoratedIT.java | 2 +- .../it/{ => testing}/ImplementsExtendsIT.java | 2 +- .../InjectorSpecificAnnotationIT.java | 2 +- .../it/{ => testing}/ModelFactorySimpleIT.java | 2 +- .../it/{ => testing}/PathBoundServletIT.java | 6 +- .../ServiceInjectionWithDifferentRankingIT.java | 2 +- .../sling/models/it/{ => testing}/SimpleIT.java | 2 +- .../sling/models/it/{ => testing}/ViaIT.java | 2 +- .../{ => testing}/delegate/DelegateRequestIT.java | 4 +- .../{ => testing}/delegate/DelegateResourceIT.java | 2 +- .../ViaOriginalResourceDelegationIT.java | 4 +- .../it/{ => testing}/helper/FakeRequest.java | 2 +- .../it/{ => testing}/helper/FakeResponse.java | 2 +- .../it/{ => testing}/rtbound/FakeRequest.java | 2 +- .../rtbound/ResourceTypeBindingIT.java | 2 +- .../rtboundpicker/ResourceTypePickerIT.java | 2 +- 30 files changed, 160 insertions(+), 233 deletions(-) diff --git a/pom.xml b/pom.xml index 94116ec..8982fac 100644 --- a/pom.xml +++ b/pom.xml @@ -290,6 +290,12 @@ <version>3.0.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.github.classgraph</groupId> + <artifactId>classgraph</artifactId> + <version>4.8.184</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -367,6 +373,29 @@ </configuration> </plugin> + <!-- Generate IT Test Bundle on the fly via TinyBundles --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>3.6.3</version> + <executions> + <execution> + <id>generate-it-testbundle</id> + <goals> + <goal>java</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <classpathScope>test</classpathScope> + <mainClass>org.apache.sling.models.it.GenerateTestBundle</mainClass> + <arguments> + <argument>${project.build.directory}/it-testbundle.jar</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -383,6 +412,21 @@ </portNames> </configuration> </execution> + <execution> + <id>attach-it-testbundle</id> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/it-testbundle.jar</file> + <type>jar</type> + <classifier>ittestbundle</classifier> + </artifact> + </artifacts> + </configuration> + </execution> </executions> </plugin> @@ -443,7 +487,7 @@ <goal>analyse-features</goal> <goal>attach-features</goal> </goals> - <phase>prepare-package</phase> + <phase>pre-integration-test</phase> </execution> </executions> </plugin> diff --git a/src/test/it-features/launcher.json b/src/test/it-features/launcher.json index 291d66e..9d8bd65 100644 --- a/src/test/it-features/launcher.json +++ b/src/test/it-features/launcher.json @@ -9,7 +9,7 @@ "start-order": 20 }, { - "id": "org.apache.sling/org.apache.sling.models.impl.it.test-models/${project.version}", + "id": "org.apache.sling/org.apache.sling.models.impl/${project.version}//ittestbundle", "start-order": 20 } ], diff --git a/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java b/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java index ed04105..18b9efe 100644 --- a/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java +++ b/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java @@ -45,7 +45,7 @@ public class SM_TeleporterCustomizer implements TeleporterRule.Customizer { cst.setBaseUrl(S.getServerBaseUrl()); cst.setServerCredentials(S.getServerUsername(), S.getServerPassword()); cst.setTestReadyTimeoutSeconds(TimeoutsProvider.getInstance().getTimeout(5)); - cst.includeDependencyPrefix("org.apache.sling.models.testing"); + cst.includeDependencyPrefix("org.apache.sling.models.it.testing"); // additionally check for the registration of mandatory sling models components try (OsgiConsoleClient osgiClient = diff --git a/src/test/java/org/apache/sling/models/it/GenerateTestBundle.java b/src/test/java/org/apache/sling/models/it/GenerateTestBundle.java new file mode 100644 index 0000000..d121ae2 --- /dev/null +++ b/src/test/java/org/apache/sling/models/it/GenerateTestBundle.java @@ -0,0 +1,93 @@ +/* + * 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.sling.models.it; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + +import io.github.classgraph.ClassGraph; +import io.github.classgraph.ClassInfo; +import io.github.classgraph.ScanResult; +import org.apache.sling.models.annotations.Model; +import org.ops4j.pax.tinybundles.TinyBundle; +import org.ops4j.pax.tinybundles.TinyBundles; +import org.osgi.framework.Constants; + +/** + * This uses tinybundles to create a test bundle that is deployed to sling + * starter. The test bundle contains all classes from the packages + * org.apache.sling.models.it.testbundle.* + */ +public class GenerateTestBundle { + + private static final String DUMMY_TEXT = "Dummy file for Integration Test bundle."; + + public static void main(String[] args) throws Exception { + Path outputFile = Paths.get(args[0]); + try (InputStream bundleStream = createBundle().build(TinyBundles.bndBuilder())) { + Files.copy(bundleStream, outputFile); + } + System.out.println("Test bundle created at " + outputFile.toAbsolutePath()); + } + + static TinyBundle createBundle() { + TinyBundle bundle = TinyBundles.bundle() + .setHeader(Constants.BUNDLE_NAME, "Apache Sling Models Implementation - IT Test Bundle") + .setHeader(Constants.BUNDLE_VERSION, "1.0.0-SNAPSHOT") + .setHeader(Constants.EXPORT_PACKAGE, "org.apache.sling.models.it.testbundle.*") + // optional import for 1 test case + .setHeader(Constants.IMPORT_PACKAGE, "org.apache.commons.beanutils;resolution:=optional,*") + // add dummy files to please verify-legal-files check + .addResource("META-INF/LICENSE", new ByteArrayInputStream(DUMMY_TEXT.getBytes(StandardCharsets.UTF_8))) + .addResource("META-INF/NOTICE", new ByteArrayInputStream(DUMMY_TEXT.getBytes(StandardCharsets.UTF_8))); + + // add all testbundle classes + Set<String> modelClassNames = new TreeSet<>(); + getAllClasses().forEach(clazz -> { + bundle.addClass(clazz); + if (clazz.isAnnotationPresent(Model.class)) { + modelClassNames.add(clazz.getName()); + } + }); + + bundle.setHeader("Sling-Model-Classes", modelClassNames.stream().collect(Collectors.joining(","))); + + return bundle; + } + + /** + * Dynamically find all classes in classpath under package(s) org.apache.sling.models.it.testbundle.* + */ + static List<Class<?>> getAllClasses() { + try (ScanResult scanResult = new ClassGraph() + .enableClassInfo() + .acceptPackages("org.apache.sling.models.it.testbundle") + .scan()) { + return scanResult.getAllClasses().stream().map(ClassInfo::loadClass).collect(Collectors.toList()); + } + } +} diff --git a/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/package-info.java deleted file mode 100644 index ad984f5..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.delegate.request; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/package-info.java deleted file mode 100644 index 0b42b01..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.delegate.resource; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/package-info.java deleted file mode 100644 index e2565dc..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/package-info.java deleted file mode 100644 index d657fc9..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/implpicker/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/implpicker/package-info.java deleted file mode 100644 index f65a8f6..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/implpicker/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.implpicker; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/package-info.java deleted file mode 100644 index f600677..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.models.implextend; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/models/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/models/package-info.java deleted file mode 100644 index 6bf456a..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/models/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.models; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/rtbound/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/package-info.java deleted file mode 100644 index bbbbeaa..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/rtbound/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.rtbound; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/package-info.java deleted file mode 100644 index f9c8f4b..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.rtboundpicker; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/testbundle/services/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/services/package-info.java deleted file mode 100644 index b3c9b24..0000000 --- a/src/test/java/org/apache/sling/models/it/testbundle/services/package-info.java +++ /dev/null @@ -1,21 +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. - */ - -@Version("1.0") -package org.apache.sling.models.it.testbundle.services; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/DecoratedIT.java b/src/test/java/org/apache/sling/models/it/testing/DecoratedIT.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/DecoratedIT.java rename to src/test/java/org/apache/sling/models/it/testing/DecoratedIT.java index 4092ae0..d808af0 100644 --- a/src/test/java/org/apache/sling/models/it/DecoratedIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/DecoratedIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.Session; diff --git a/src/test/java/org/apache/sling/models/it/ImplementsExtendsIT.java b/src/test/java/org/apache/sling/models/it/testing/ImplementsExtendsIT.java similarity index 99% rename from src/test/java/org/apache/sling/models/it/ImplementsExtendsIT.java rename to src/test/java/org/apache/sling/models/it/testing/ImplementsExtendsIT.java index fb1e9bf..b84f525 100644 --- a/src/test/java/org/apache/sling/models/it/ImplementsExtendsIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/ImplementsExtendsIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/src/test/java/org/apache/sling/models/it/InjectorSpecificAnnotationIT.java b/src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/InjectorSpecificAnnotationIT.java rename to src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java index 68cdd78..7b9cb71 100644 --- a/src/test/java/org/apache/sling/models/it/InjectorSpecificAnnotationIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.Session; diff --git a/src/test/java/org/apache/sling/models/it/ModelFactorySimpleIT.java b/src/test/java/org/apache/sling/models/it/testing/ModelFactorySimpleIT.java similarity index 99% rename from src/test/java/org/apache/sling/models/it/ModelFactorySimpleIT.java rename to src/test/java/org/apache/sling/models/it/testing/ModelFactorySimpleIT.java index 7e4f05b..13dc9a5 100644 --- a/src/test/java/org/apache/sling/models/it/ModelFactorySimpleIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/ModelFactorySimpleIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.Session; diff --git a/src/test/java/org/apache/sling/models/it/PathBoundServletIT.java b/src/test/java/org/apache/sling/models/it/testing/PathBoundServletIT.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/PathBoundServletIT.java rename to src/test/java/org/apache/sling/models/it/testing/PathBoundServletIT.java index 5efef2d..5ebc12a 100644 --- a/src/test/java/org/apache/sling/models/it/PathBoundServletIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/PathBoundServletIT.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.engine.SlingRequestProcessor; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.helper.FakeRequest; -import org.apache.sling.models.it.helper.FakeResponse; +import org.apache.sling.models.it.testing.helper.FakeRequest; +import org.apache.sling.models.it.testing.helper.FakeResponse; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingIT.java b/src/test/java/org/apache/sling/models/it/testing/ServiceInjectionWithDifferentRankingIT.java similarity index 99% rename from src/test/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingIT.java rename to src/test/java/org/apache/sling/models/it/testing/ServiceInjectionWithDifferentRankingIT.java index 29b4894..2aadd04 100644 --- a/src/test/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/ServiceInjectionWithDifferentRankingIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.Session; diff --git a/src/test/java/org/apache/sling/models/it/SimpleIT.java b/src/test/java/org/apache/sling/models/it/testing/SimpleIT.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/SimpleIT.java rename to src/test/java/org/apache/sling/models/it/testing/SimpleIT.java index 2d94f18..5539600 100644 --- a/src/test/java/org/apache/sling/models/it/SimpleIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/SimpleIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.Session; diff --git a/src/test/java/org/apache/sling/models/it/ViaIT.java b/src/test/java/org/apache/sling/models/it/testing/ViaIT.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/ViaIT.java rename to src/test/java/org/apache/sling/models/it/testing/ViaIT.java index 9db5d9f..c223cb6 100644 --- a/src/test/java/org/apache/sling/models/it/ViaIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/ViaIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it; +package org.apache.sling.models.it.testing; import javax.jcr.Node; import javax.jcr.Session; diff --git a/src/test/java/org/apache/sling/models/it/delegate/DelegateRequestIT.java b/src/test/java/org/apache/sling/models/it/testing/delegate/DelegateRequestIT.java similarity index 97% rename from src/test/java/org/apache/sling/models/it/delegate/DelegateRequestIT.java rename to src/test/java/org/apache/sling/models/it/testing/delegate/DelegateRequestIT.java index dd38d09..a2ea800 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/DelegateRequestIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/delegate/DelegateRequestIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate; +package org.apache.sling.models.it.testing.delegate; import java.util.HashMap; import java.util.Map; @@ -30,10 +30,10 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.rtbound.FakeRequest; import org.apache.sling.models.it.testbundle.delegate.request.DelegateBaseModel; import org.apache.sling.models.it.testbundle.delegate.request.DelegateExtendedModel; import org.apache.sling.models.it.testbundle.delegate.request.DelegateInterface; +import org.apache.sling.models.it.testing.rtbound.FakeRequest; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/it/delegate/DelegateResourceIT.java b/src/test/java/org/apache/sling/models/it/testing/delegate/DelegateResourceIT.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/delegate/DelegateResourceIT.java rename to src/test/java/org/apache/sling/models/it/testing/delegate/DelegateResourceIT.java index 0a0d21c..8a1b621 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/DelegateResourceIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/delegate/DelegateResourceIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate; +package org.apache.sling.models.it.testing.delegate; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java b/src/test/java/org/apache/sling/models/it/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java similarity index 97% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java rename to src/test/java/org/apache/sling/models/it/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java index b4bd6bd..fe631ce 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testing.delegate.viaoriginalresource; import java.util.HashMap; import java.util.Map; @@ -29,12 +29,12 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.rtbound.FakeRequest; import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.A; import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.A1Impl; import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.AImpl; import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.B1Impl; import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.BImpl; +import org.apache.sling.models.it.testing.rtbound.FakeRequest; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/it/helper/FakeRequest.java b/src/test/java/org/apache/sling/models/it/testing/helper/FakeRequest.java similarity index 99% rename from src/test/java/org/apache/sling/models/it/helper/FakeRequest.java rename to src/test/java/org/apache/sling/models/it/testing/helper/FakeRequest.java index 35f8725..97bb952 100644 --- a/src/test/java/org/apache/sling/models/it/helper/FakeRequest.java +++ b/src/test/java/org/apache/sling/models/it/testing/helper/FakeRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.helper; +package org.apache.sling.models.it.testing.helper; import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; diff --git a/src/test/java/org/apache/sling/models/it/helper/FakeResponse.java b/src/test/java/org/apache/sling/models/it/testing/helper/FakeResponse.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/helper/FakeResponse.java rename to src/test/java/org/apache/sling/models/it/testing/helper/FakeResponse.java index 70317cf..252e662 100644 --- a/src/test/java/org/apache/sling/models/it/helper/FakeResponse.java +++ b/src/test/java/org/apache/sling/models/it/testing/helper/FakeResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.helper; +package org.apache.sling.models.it.testing.helper; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; diff --git a/src/test/java/org/apache/sling/models/it/rtbound/FakeRequest.java b/src/test/java/org/apache/sling/models/it/testing/rtbound/FakeRequest.java similarity index 99% rename from src/test/java/org/apache/sling/models/it/rtbound/FakeRequest.java rename to src/test/java/org/apache/sling/models/it/testing/rtbound/FakeRequest.java index d84705b..73f91e4 100644 --- a/src/test/java/org/apache/sling/models/it/rtbound/FakeRequest.java +++ b/src/test/java/org/apache/sling/models/it/testing/rtbound/FakeRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtbound; +package org.apache.sling.models.it.testing.rtbound; import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; diff --git a/src/test/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingIT.java b/src/test/java/org/apache/sling/models/it/testing/rtbound/ResourceTypeBindingIT.java similarity index 99% rename from src/test/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingIT.java rename to src/test/java/org/apache/sling/models/it/testing/rtbound/ResourceTypeBindingIT.java index a7af956..44d2a37 100644 --- a/src/test/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/rtbound/ResourceTypeBindingIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtbound; +package org.apache.sling.models.it.testing.rtbound; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerIT.java b/src/test/java/org/apache/sling/models/it/testing/rtboundpicker/ResourceTypePickerIT.java similarity index 98% rename from src/test/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerIT.java rename to src/test/java/org/apache/sling/models/it/testing/rtboundpicker/ResourceTypePickerIT.java index 9f5c654..42c87ee 100644 --- a/src/test/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/rtboundpicker/ResourceTypePickerIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtboundpicker; +package org.apache.sling.models.it.testing.rtboundpicker; import java.util.HashMap; import java.util.Map;
