libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #3674 from mposolda/master

Browse source 
Remove obsolete maven profile
This commit is contained in:
Marek Posolda 2016-12-20 00:18:15 +01:00 committed by GitHub
commit 3498273601
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
testsuite/integration/pom.xml
View file

@ -591,32 +591,5 @@
</build> </build>
</profile> </profile>
<!-- Ldap profiles -->
<profile>
<activation>
<property>
<name>ldap.vendor</name>
<value>msad</value>
</property>
</activation>
<id>msad</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>org/keycloak/testsuite/federation/ldap/base/**</include>
</includes>
<excludes>
<exclude>**/LDAPMultipleAttributesTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>

7
testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPLegacyImportTest.java
View file

@ -69,6 +69,7 @@ import org.openqa.selenium.WebDriver;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -80,7 +81,11 @@ import static org.junit.Assert.assertEquals;
@FixMethodOrder(MethodSorters.NAME_ASCENDING) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class LDAPLegacyImportTest { public class LDAPLegacyImportTest {
private static LDAPRule ldapRule = new LDAPRule(); // This test is executed just for the embedded LDAP server
private static LDAPRule ldapRule = new LDAPRule((Map<String, String> ldapConfig) -> {
String connectionURL = ldapConfig.get(LDAPConstants.CONNECTION_URL);
return !"ldap://localhost:10389".equals(connectionURL);
});
private static ComponentModel ldapModel = null; private static ComponentModel ldapModel = null;