Browse Source

Fix test code formatting

pull/26044/head
Juergen Hoeller 4 years ago
parent
commit
4e8d6bea4d
  1. 1
      spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
  2. 6
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
  3. 38
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
  4. 38
      spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java

1
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java

@ -76,7 +76,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -76,7 +76,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
*/
public class SpelReproTests extends AbstractExpressionTests {
@Test
public void NPE_SPR5661() {
evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class);

6
spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,9 +16,10 @@ @@ -16,9 +16,10 @@
package org.springframework.expression.spel.testresources;
///CLOVER:OFF
public class Person {
private String privateName;
Company company;
public Person(String name) {
@ -41,4 +42,5 @@ public class Person { @@ -41,4 +42,5 @@ public class Person {
public Company getCompany() {
return company;
}
}

38
spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -19,19 +19,25 @@ package org.springframework.expression.spel.testresources; @@ -19,19 +19,25 @@ package org.springframework.expression.spel.testresources;
import java.util.List;
public class TestAddress{
private String street;
private List<String> crossStreets;
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public List<String> getCrossStreets() {
return crossStreets;
}
public void setCrossStreets(List<String> crossStreets) {
this.crossStreets = crossStreets;
}
private String street;
private List<String> crossStreets;
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public List<String> getCrossStreets() {
return crossStreets;
}
public void setCrossStreets(List<String> crossStreets) {
this.crossStreets = crossStreets;
}
}

38
spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,19 +17,25 @@ @@ -17,19 +17,25 @@
package org.springframework.expression.spel.testresources;
public class TestPerson {
private String name;
private TestAddress address;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public TestAddress getAddress() {
return address;
}
public void setAddress(TestAddress address) {
this.address = address;
}
private String name;
private TestAddress address;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public TestAddress getAddress() {
return address;
}
public void setAddress(TestAddress address) {
this.address = address;
}
}

Loading…
Cancel
Save