|
@@ -3,7 +3,7 @@ |
3 |
3 |
|
|
4 |
4 |
|
import junit.framework.*; |
5 |
5 |
|
|
6 |
|
- |
import org.litesoft.core.util.*; |
|
6 |
+ |
import org.litesoft.core.typeutils.*; |
7 |
7 |
|
|
8 |
8 |
|
public class HierarchicalDataSimpleFactoryTest extends TestCase |
9 |
9 |
|
{ |
|
@@ -178,7 +178,7 @@ |
178 |
178 |
|
} |
179 |
179 |
|
|
180 |
180 |
|
assertEquals( "ABC", node.getName() ); |
181 |
|
- |
assertEquals( "a\nb\nc\n", UtilsCommon.linesToString( node.getAttributeNames() ) ); |
|
181 |
+ |
assertEquals( "a\nb\nc\n", Strings.linesToString( node.getAttributeNames() ) ); |
182 |
182 |
|
|
183 |
183 |
|
assertEquals( "A", node.getAttributeValue( "a" ) ); |
184 |
184 |
|
assertEquals( "B", node.getAttributeValue( "b" ) ); |
|
@@ -186,13 +186,13 @@ |
186 |
186 |
|
|
187 |
187 |
|
HierarchicalDataSource.Node node1 = node.getNextChild(); |
188 |
188 |
|
assertEquals( "DEF", node1.getName() ); |
189 |
|
- |
assertEquals( "e\n", UtilsCommon.linesToString( node1.getAttributeNames() ) ); |
|
189 |
+ |
assertEquals( "e\n", Strings.linesToString( node1.getAttributeNames() ) ); |
190 |
190 |
|
|
191 |
191 |
|
assertEquals( "E", node1.getAttributeValue( "e" ) ); |
192 |
192 |
|
|
193 |
193 |
|
HierarchicalDataSource.Node node11 = node1.getNextChild(); |
194 |
194 |
|
assertEquals( "GHI", node11.getName() ); |
195 |
|
- |
assertEquals( "g\n", UtilsCommon.linesToString( node11.getAttributeNames() ) ); |
|
195 |
+ |
assertEquals( "g\n", Strings.linesToString( node11.getAttributeNames() ) ); |
196 |
196 |
|
|
197 |
197 |
|
assertEquals( "G", node11.getAttributeValue( "g" ) ); |
198 |
198 |
|
|
|
@@ -202,7 +202,7 @@ |
202 |
202 |
|
|
203 |
203 |
|
HierarchicalDataSource.Node node2 = node.getNextChild(); |
204 |
204 |
|
assertEquals( "DEF2", node2.getName() ); |
205 |
|
- |
assertEquals( "f\n", UtilsCommon.linesToString( node2.getAttributeNames() ) ); |
|
205 |
+ |
assertEquals( "f\n", Strings.linesToString( node2.getAttributeNames() ) ); |
206 |
206 |
|
|
207 |
207 |
|
assertEquals( "F", node2.getAttributeValue( "f" ) ); |
208 |
208 |
|
|
|
@@ -229,13 +229,13 @@ |
229 |
229 |
|
|
230 |
230 |
|
HierarchicalDataSource.Node node1 = node.getNextChild(); |
231 |
231 |
|
assertEquals( "DEF", node1.getName() ); |
232 |
|
- |
assertEquals( "e_.\n", UtilsCommon.linesToString( node1.getAttributeNames() ) ); |
|
232 |
+ |
assertEquals( "e_.\n", Strings.linesToString( node1.getAttributeNames() ) ); |
233 |
233 |
|
|
234 |
234 |
|
assertEquals( "E", node1.getAttributeValue( "e_." ) ); |
235 |
235 |
|
|
236 |
236 |
|
HierarchicalDataSource.Node node11 = node1.getNextChild(); |
237 |
237 |
|
assertEquals( "GHI", node11.getName() ); |
238 |
|
- |
assertEquals( "g\n", UtilsCommon.linesToString( node11.getAttributeNames() ) ); |
|
238 |
+ |
assertEquals( "g\n", Strings.linesToString( node11.getAttributeNames() ) ); |
239 |
239 |
|
|
240 |
240 |
|
assertEquals( "G", node11.getAttributeValue( "g" ) ); |
241 |
241 |
|
|