litesoft
Diff Revisions
820
vs
821
for /trunk/Java/core/Server/src/org/litesoft/TestCasePlus.java
|
@@ -6,6 +6,7 @@ |
6 |
6 |
|
|
7 |
7 |
|
import junit.framework.*; |
8 |
8 |
|
|
|
9 |
+ |
import org.litesoft.core.typeutils.*; |
9 |
10 |
|
import org.litesoft.util.*; |
10 |
11 |
|
|
11 |
12 |
|
public class TestCasePlus extends TestCase |
|
@@ -286,13 +287,13 @@ |
286 |
287 |
|
{ |
287 |
288 |
|
if ( !Arrays.equals( pExpectedLines, pActualLines ) ) |
288 |
289 |
|
{ |
289 |
|
- |
failNotAreEqual( pFailureLabel, Utils.combineAsLines( pExpectedLines ), Utils.combineAsLines( pActualLines ) ); |
|
290 |
+ |
failNotAreEqual( pFailureLabel, Strings.combineAsLines( pExpectedLines ), Strings.combineAsLines( pActualLines ) ); |
290 |
291 |
|
} |
291 |
292 |
|
} |
292 |
293 |
|
|
293 |
294 |
|
public static void assertAreEqual( String pFailureLabel, String[] pExpectedLines, String pActual ) |
294 |
295 |
|
{ |
295 |
|
- |
String expected = Utils.combineAsLines( pExpectedLines ); |
|
296 |
+ |
String expected = Strings.combineAsLines( pExpectedLines ); |
296 |
297 |
|
if ( !Utils.areEqual( pActual, expected ) ) |
297 |
298 |
|
{ |
298 |
299 |
|
failNotAreEqual( pFailureLabel, expected, pActual ); |
|
@@ -331,7 +332,7 @@ |
331 |
332 |
|
|
332 |
333 |
|
public static void assertToString( String pFailureLabel, Object pObject, String... pExpectedLines ) |
333 |
334 |
|
{ |
334 |
|
- |
assertEquals( pFailureLabel, Utils.combine( '\n', pExpectedLines ), pObject.toString() ); |
|
335 |
+ |
assertEquals( pFailureLabel, Strings.combine( '\n', pExpectedLines ), pObject.toString() ); |
335 |
336 |
|
} |
336 |
337 |
|
|
337 |
338 |
|
private static void markActual( String pExpected, StringBuilder pActual ) |