Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testing libraries #2133

Merged
merged 18 commits into from
Jan 26, 2020
Merged

Update testing libraries #2133

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dd2cf5c
update AEM Mocks library to latest 2.7.2
joerghoh Dec 7, 2019
3f059c4
update sling-testing mocks to their latest versions
joerghoh Dec 7, 2019
04ccca8
Merge branch 'master' into feature/update-testing-libraries
joerghoh Dec 7, 2019
7e62875
minor version bumps for testing libs
joerghoh Dec 15, 2019
f9962c0
update hamcrest (see http://hamcrest.org/JavaHamcrest/distributables.…
joerghoh Dec 15, 2019
824cfae
fix incorrect hamcrest dependencies
joerghoh Dec 15, 2019
46d9d03
update xmlunit dependency
joerghoh Dec 15, 2019
29c8210
enable 2 tests again
joerghoh Dec 15, 2019
1783a4f
update s3 mock library and joda time
joerghoh Dec 15, 2019
3d8c6ff
update portfinder
joerghoh Dec 15, 2019
ab7bf3c
update release plugins
joerghoh Dec 15, 2019
921bbd3
update commons-csv
joerghoh Dec 15, 2019
c34ee29
update to latest ACS AEM Commons, reenable disabled testcase
joerghoh Dec 19, 2019
9261ac5
Merge branch 'master' into feature/update-testing-libraries
joerghoh Dec 19, 2019
8b38a36
updated Changelog
joerghoh Dec 19, 2019
d478123
Merge branch 'master' into feature/update-testing-libraries
badvision Jan 8, 2020
dc01443
Merge branch 'master' into feature/update-testing-libraries
joerghoh Jan 18, 2020
47572eb
Merge branch 'master' into feature/update-testing-libraries
joerghoh Jan 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -431,7 +439,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>1.5.2</version>
<version>2.9.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -613,7 +621,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.6</version>
<version>1.7</version>
<scope>test</scope>
</dependency>
<!-- needed to override the embedded commons.osgi in org.apache.sling.models.impl -->
Expand Down Expand Up @@ -687,10 +695,6 @@
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.jcr-mock</artifactId>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.junit4</artifactId>
Expand All @@ -709,20 +713,16 @@
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</dependency>
<dependency>
<groupId>me.alexpanov</groupId>
<artifactId>free-port-finder</artifactId>
<version>1.0</version>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.findify</groupId>
<artifactId>s3mock_2.11</artifactId>
<version>0.2.3</version>
<version>0.2.5</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -734,7 +734,7 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<version>2.5.1</version>
<version>2.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mockito;
Expand Down Expand Up @@ -76,6 +77,8 @@ protected HttpURLConnection openConnection() throws IOException {
}

@Test
@Ignore
// Ignore until https://wcm-io.atlassian.net/browse/WTES-48 is resolved
joerghoh marked this conversation as resolved.
Show resolved Hide resolved
public void testFetch() throws IOException, ReplicationException {
fileFetch.activate(new FileFetchConfiguration() {

Expand Down
1 change: 0 additions & 1 deletion ...le/src/test/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public void init() throws HttpCacheRepositoryAccessException {

when(request.getResourceResolver()).thenReturn(resourceResolver);
when(resourceResolver.getUserID()).thenReturn("anonymous");
when(extension.accepts(request, systemUnderTest)).thenReturn(true);
}

private void activateWithDefaultValues(Map<String,Object> specifiedProps){
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/AssetFolderCreatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.amazonaws.services.s3.S3ClientOptions;
import com.day.cq.dam.api.AssetManager;
import com.google.common.base.Function;
import io.findify.s3mock.S3Mock;
import me.alexpanov.net.FreePortFinder;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.ModifiableValueMap;
Expand Down
4 changes: 2 additions & 2 deletions bundle/src/test/java/com/adobe/acs/commons/wcm/comparisons/impl/VersionServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ public void lastVersion_oneVersion_returnVersion() throws Exception {
}

@Test
@Ignore
// @Ignore
public void lastVersion_noElement_returnNull() throws Exception {
Version lastVersion = underTest.lastVersion(context.resourceResolver().getResource("/noVersion"));
assertNull(lastVersion);
}

@Test
@Ignore
// @Ignore
public void lastVersion_listOfVersion_returnLast() throws Exception {
Version lastVersion = underTest.lastVersion(context.resourceResolver().getResource("/manyVersions"));
assertEquals(lastVersion.getUUID(), manyVersionVersion.getUUID());
Expand Down
32 changes: 16 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
<version>2.2</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-oddeven-policy</artifactId>
<version>2.5.3</version>
<version>3.0-r1585899</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -375,31 +375,31 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>2.0.2</version>
<version>2.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>2.0.2</version>
<version>2.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
<version>2.3.4</version>
<version>2.3.18</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
<version>2.3.4</version>
<version>2.3.18</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -411,19 +411,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
<version>2.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.jcr-mock</artifactId>
<version>1.4.0</version>
<version>2.1.8-1.16.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.junit4</artifactId>
<version>2.3.2</version>
<version>2.7.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -438,10 +432,16 @@
<version>1.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down