Merge branch 'develop' into stable
This commit is contained in:
commit
d0c1e92bce
@ -0,0 +1,40 @@
|
||||
package com.inteligr8.alfresco.acs;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.ws.rs.NotFoundException;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
|
||||
import com.inteligr8.alfresco.acs.api.DiscoveryApi;
|
||||
import com.inteligr8.alfresco.acs.api.NodesApi;
|
||||
import com.inteligr8.alfresco.acs.model.RepositoryInfo;
|
||||
|
||||
public abstract class ConnectionClientIT extends ConditionalIT {
|
||||
|
||||
public abstract AcsPublicRestApi getClient();
|
||||
|
||||
@Test
|
||||
@EnabledIf("hostExists")
|
||||
public void testDiscovery() {
|
||||
DiscoveryApi api = this.getClient().getDiscoveryApi();
|
||||
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
|
||||
|
||||
Assertions.assertNotNull(repoInfo);
|
||||
Assertions.assertFalse(repoInfo.getStatus().isIsReadOnly());
|
||||
Assertions.assertEquals("6", repoInfo.getVersion().getMajor());
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnabledIf("hostExists")
|
||||
public void testMissingNode() {
|
||||
NodesApi api = this.getClient().getNodesApi();
|
||||
|
||||
Assertions.assertThrows(NotFoundException.class, () -> {
|
||||
api.getNode(UUID.randomUUID().toString(), null, null, null);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
@ -1,39 +1,28 @@
|
||||
package com.inteligr8.alfresco.acs;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.test.context.TestPropertySource;
|
||||
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
|
||||
|
||||
import com.inteligr8.alfresco.acs.api.DiscoveryApi;
|
||||
import com.inteligr8.alfresco.acs.model.RepositoryInfo;
|
||||
import com.inteligr8.rs.ClientConfiguration;
|
||||
|
||||
@TestPropertySource(locations = {"/local.properties"})
|
||||
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
|
||||
public class ConnectionCxfClientIT extends ConditionalIT {
|
||||
public class ConnectionCxfClientIT extends ConnectionClientIT {
|
||||
|
||||
@Autowired
|
||||
@Qualifier("acs.api.cxf")
|
||||
private AcsPublicRestApi client;
|
||||
|
||||
@Override
|
||||
public AcsPublicRestApi getClient() {
|
||||
return this.client;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClientConfiguration getConfiguration() {
|
||||
return this.client.getConfig();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnabledIf("hostExists")
|
||||
public void testDiscovery() {
|
||||
DiscoveryApi api = this.client.getDiscoveryApi();
|
||||
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
|
||||
|
||||
Assertions.assertNotNull(repoInfo);
|
||||
Assertions.assertFalse(repoInfo.getStatus().isIsReadOnly());
|
||||
Assertions.assertEquals("6", repoInfo.getVersion().getMajor());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,39 +1,28 @@
|
||||
package com.inteligr8.alfresco.acs;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.test.context.TestPropertySource;
|
||||
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
|
||||
|
||||
import com.inteligr8.alfresco.acs.api.DiscoveryApi;
|
||||
import com.inteligr8.alfresco.acs.model.RepositoryInfo;
|
||||
import com.inteligr8.rs.ClientConfiguration;
|
||||
|
||||
@TestPropertySource(locations = {"/local.properties"})
|
||||
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
|
||||
public class ConnectionJerseyClientIT extends ConditionalIT {
|
||||
public class ConnectionJerseyClientIT extends ConnectionClientIT {
|
||||
|
||||
@Autowired
|
||||
@Qualifier("acs.api.jersey")
|
||||
private AcsPublicRestApi client;
|
||||
|
||||
@Override
|
||||
public AcsPublicRestApi getClient() {
|
||||
return this.client;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClientConfiguration getConfiguration() {
|
||||
return this.client.getConfig();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnabledIf("hostExists")
|
||||
public void testDiscovery() {
|
||||
DiscoveryApi api = this.client.getDiscoveryApi();
|
||||
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
|
||||
|
||||
Assertions.assertNotNull(repoInfo);
|
||||
Assertions.assertFalse(repoInfo.getStatus().isIsReadOnly());
|
||||
Assertions.assertEquals("6", repoInfo.getVersion().getMajor());
|
||||
}
|
||||
|
||||
}
|
||||
|
5
src/test/resources/local-oauth.properties
Normal file
5
src/test/resources/local-oauth.properties
Normal file
@ -0,0 +1,5 @@
|
||||
content.service.baseUrl=http://localhost:8080/alfresco
|
||||
content.service.security.oauth.tokenUrl=http://auth.example.org:8080/auth/realms/alfresco/protocol/openid-connect/token
|
||||
content.service.security.oauth.clientId=alfresco
|
||||
content.service.security.oauth.grantUsername=admin
|
||||
content.service.security.oauth.grantPassword=admin
|
Loading…
x
Reference in New Issue
Block a user