Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use this. Prefix in Ldif Tests

Browse Source 
Issue gh-745
This commit is contained in:
Josh Cummings
2023-05-09 16:32:37 -06:00
parent 66992b0807
commit 961146182f
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java
View File

@@ -162,39 +162,39 @@ public class DefaultAttributeValidationPolicyTests {
@Test
public void parseAttribute() {
try {
LdapAttribute attribute = (LdapAttribute) policy.parse(line);
LdapAttribute attribute = (LdapAttribute) policy.parse(this.line);
assertThat(id.equalsIgnoreCase(attribute.getID()))
.as("IDs do not match: [expected: " + attribute.getID() + ", obtained: " + id + "]").isTrue();
assertThat(this.id.equalsIgnoreCase(attribute.getID()))
.as("IDs do not match: [expected: " + attribute.getID() + ", obtained: " + this.id + "]").isTrue();
String[] expected = !StringUtils.hasLength(options) ? new String[] {}
: options.replaceFirst(";", "").split(";");
String[] expected = !StringUtils.hasLength(this.options) ? new String[] {}
: this.options.replaceFirst(";", "").split(";");
Arrays.sort(expected);
String[] obtained = attribute.getOptions().toArray(new String[] {});
Arrays.sort(obtained);
assertThat(obtained).as("Options do not match: ").isEqualTo(expected);
switch (type) {
switch (this.type) {
case STRING:
assertThat(attribute.get() instanceof String).as("Value is not a string.").isTrue();
assertThat(attribute.get()).as("Values do not match: ").isEqualTo(value);
assertThat(attribute.get()).as("Values do not match: ").isEqualTo(this.value);
break;
case BASE64:
byte[] bytes = LdapEncoder.parseBase64Binary(value);
byte[] bytes = LdapEncoder.parseBase64Binary(this.value);
assertThat(attribute.get() instanceof byte[]).as("Value is not a byte[].").isTrue();
assertThat((byte[]) attribute.get()).as("Values do not match: ").isEqualTo(bytes);
break;
case URL:
URI url = new URI(value);
URI url = new URI(this.value);
assertThat(attribute.get() instanceof URI).as("Value is not a URL.").isTrue();
assertThat(attribute.get()).as("Values do not match: ").isEqualTo(url);
break;
case UTF8:
assertThat(attribute.get() instanceof String).as("Value is not a UTF8.").isTrue();
assertThat(attribute.get()).as("Values do not match: ").isEqualTo(value);
assertThat(attribute.get()).as("Values do not match: ").isEqualTo(this.value);
break;
}
@@ -202,7 +202,7 @@ public class DefaultAttributeValidationPolicyTests {
}
catch (Exception e) {
if (!exceptions.contains(line))
if (!this.exceptions.contains(this.line))
fail("Exception thrown: " + e.getClass().getSimpleName() + " (message: " + e.getMessage() + ")");
}
}

14
ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java
View File

@@ -59,8 +59,8 @@ public class LdifParserTests {
* verification of LDIF correctness.
*/
public LdifParserTests() {
parser = new LdifParser(new ClassPathResource("test.ldif"));
parser.setRecordSpecification(new BasicSchemaSpecification());
this.parser = new LdifParser(new ClassPathResource("test.ldif"));
this.parser.setRecordSpecification(new BasicSchemaSpecification());
}
/**
@@ -69,7 +69,7 @@ public class LdifParserTests {
@Before
public void openLdif() {
try {
parser.open();
this.parser.open();
}
catch (IOException e) {
fail(e.getMessage());
@@ -87,9 +87,9 @@ public class LdifParserTests {
try {
LdapAttributes attributes;
while (parser.hasMoreRecords()) {
while (this.parser.hasMoreRecords()) {
try {
attributes = parser.getRecord();
attributes = this.parser.getRecord();
log.info("attributes:\n" + attributes);
if (attributes != null) {
assertThat(attributes.getDN() != null).isTrue();
@@ -104,7 +104,7 @@ public class LdifParserTests {
}
}
log.debug("hasMoreRecords: " + parser.hasMoreRecords());
log.debug("hasMoreRecords: " + this.parser.hasMoreRecords());
}
log.info("record count: " + count);
@@ -125,7 +125,7 @@ public class LdifParserTests {
@After
public void closeLdif() {
try {
parser.close();
this.parser.close();
}
catch (IOException e) {
fail(e.getMessage());