Removing tabs
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@826970 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
13a0cc63cd
commit
7e83efc1d1
|
@ -1128,7 +1128,7 @@ public StrBuilder appendSeparator(String separator) {
|
||||||
* @since 3.0
|
* @since 3.0
|
||||||
*/
|
*/
|
||||||
public StrBuilder appendSeparator(String standard, String defaultIfEmpty) {
|
public StrBuilder appendSeparator(String standard, String defaultIfEmpty) {
|
||||||
String str = isEmpty() ? defaultIfEmpty : standard;
|
String str = isEmpty() ? defaultIfEmpty : standard;
|
||||||
if (str != null) {
|
if (str != null) {
|
||||||
append(str);
|
append(str);
|
||||||
}
|
}
|
||||||
|
@ -1177,7 +1177,7 @@ public StrBuilder appendSeparator(char standard, char defaultIfEmpty) {
|
||||||
append(standard);
|
append(standard);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
append(defaultIfEmpty);
|
append(defaultIfEmpty);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -996,14 +996,14 @@ public void testAppendSeparator_String() {
|
||||||
|
|
||||||
//-----------------------------------------------------------------------
|
//-----------------------------------------------------------------------
|
||||||
public void testAppendSeparator_String_String() {
|
public void testAppendSeparator_String_String() {
|
||||||
StrBuilder sb = new StrBuilder();
|
StrBuilder sb = new StrBuilder();
|
||||||
final String startSeparator = "order by ";
|
final String startSeparator = "order by ";
|
||||||
final String standardSeparator = ",";
|
final String standardSeparator = ",";
|
||||||
final String foo = "foo";
|
final String foo = "foo";
|
||||||
sb.appendSeparator(null, null);
|
sb.appendSeparator(null, null);
|
||||||
assertEquals("", sb.toString());
|
assertEquals("", sb.toString());
|
||||||
sb.appendSeparator(standardSeparator, null);
|
sb.appendSeparator(standardSeparator, null);
|
||||||
assertEquals("", sb.toString());
|
assertEquals("", sb.toString());
|
||||||
sb.appendSeparator(standardSeparator, startSeparator);
|
sb.appendSeparator(standardSeparator, startSeparator);
|
||||||
assertEquals(startSeparator, sb.toString());
|
assertEquals(startSeparator, sb.toString());
|
||||||
sb.appendSeparator(null, null);
|
sb.appendSeparator(null, null);
|
||||||
|
@ -1027,10 +1027,10 @@ public void testAppendSeparator_char() {
|
||||||
assertEquals("foo,", sb.toString());
|
assertEquals("foo,", sb.toString());
|
||||||
}
|
}
|
||||||
public void testAppendSeparator_char_char() {
|
public void testAppendSeparator_char_char() {
|
||||||
StrBuilder sb = new StrBuilder();
|
StrBuilder sb = new StrBuilder();
|
||||||
final char startSeparator = ':';
|
final char startSeparator = ':';
|
||||||
final char standardSeparator = ',';
|
final char standardSeparator = ',';
|
||||||
final String foo = "foo";
|
final String foo = "foo";
|
||||||
sb.appendSeparator(standardSeparator, startSeparator); // no effect
|
sb.appendSeparator(standardSeparator, startSeparator); // no effect
|
||||||
assertEquals(String.valueOf(startSeparator), sb.toString());
|
assertEquals(String.valueOf(startSeparator), sb.toString());
|
||||||
sb.append(foo);
|
sb.append(foo);
|
||||||
|
|
|
@ -1161,8 +1161,8 @@ public void testTruncateLang59() throws Exception {
|
||||||
* Tests various values with the ceiling method
|
* Tests various values with the ceiling method
|
||||||
*/
|
*/
|
||||||
public void testCeil() throws Exception {
|
public void testCeil() throws Exception {
|
||||||
// tests public static Date ceiling(Date date, int field)
|
// tests public static Date ceiling(Date date, int field)
|
||||||
assertEquals("ceiling year-1 failed",
|
assertEquals("ceiling year-1 failed",
|
||||||
dateParser.parse("January 1, 2003"),
|
dateParser.parse("January 1, 2003"),
|
||||||
DateUtils.ceiling(date1, Calendar.YEAR));
|
DateUtils.ceiling(date1, Calendar.YEAR));
|
||||||
assertEquals("ceiling year-2 failed",
|
assertEquals("ceiling year-2 failed",
|
||||||
|
@ -1317,7 +1317,7 @@ public void testCeil() throws Exception {
|
||||||
|
|
||||||
// Fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=25560
|
// Fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=25560
|
||||||
// Test ceiling across the beginning of daylight saving time
|
// Test ceiling across the beginning of daylight saving time
|
||||||
TimeZone.setDefault(zone);
|
TimeZone.setDefault(zone);
|
||||||
dateTimeParser.setTimeZone(zone);
|
dateTimeParser.setTimeZone(zone);
|
||||||
|
|
||||||
assertEquals("ceiling MET date across DST change-over",
|
assertEquals("ceiling MET date across DST change-over",
|
||||||
|
@ -1373,7 +1373,7 @@ public void testCeil() throws Exception {
|
||||||
} else {
|
} else {
|
||||||
this.warn("WARNING: Some date ceiling tests not run since the current version is " + SystemUtils.JAVA_VERSION);
|
this.warn("WARNING: Some date ceiling tests not run since the current version is " + SystemUtils.JAVA_VERSION);
|
||||||
}
|
}
|
||||||
TimeZone.setDefault(defaultZone);
|
TimeZone.setDefault(defaultZone);
|
||||||
dateTimeParser.setTimeZone(defaultZone);
|
dateTimeParser.setTimeZone(defaultZone);
|
||||||
|
|
||||||
// Bug 31395, large dates
|
// Bug 31395, large dates
|
||||||
|
|
Loading…
Reference in New Issue