2121import static org .junit .Assert .assertNotNull ;
2222import static org .junit .Assert .assertTrue ;
2323
24- import java .util .List ;
25-
2624import org .junit .Test ;
2725
26+ import com .helger .commons .collection .impl .ICommonsList ;
2827import com .helger .css .ECSSVersion ;
2928import com .helger .css .decl .CSSDeclaration ;
3029import com .helger .css .property .ECSSProperty ;
@@ -56,7 +55,7 @@ public void testBorder1 ()
5655 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border:1px" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
5756 assertNotNull (aDecl );
5857
59- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
58+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
6059 assertNotNull (aSplittedDecls );
6160 assertEquals (3 , aSplittedDecls .size ());
6261 assertEquals ("border-width:1px" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
@@ -73,7 +72,7 @@ public void testBorder2 ()
7372 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border:1px dashed" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
7473 assertNotNull (aDecl );
7574
76- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
75+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
7776 assertNotNull (aSplittedDecls );
7877 assertEquals (3 , aSplittedDecls .size ());
7978 assertEquals ("border-width:1px" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
@@ -91,7 +90,7 @@ public void testBorder3a ()
9190 .getDeclarationAtIndex (0 );
9291 assertNotNull (aDecl );
9392
94- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
93+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
9594 assertNotNull (aSplittedDecls );
9695 assertEquals (3 , aSplittedDecls .size ());
9796 assertEquals ("border-style:dashed" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
@@ -109,7 +108,7 @@ public void testBorder3b ()
109108 .getDeclarationAtIndex (0 );
110109 assertNotNull (aDecl );
111110
112- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
111+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
113112 assertNotNull (aSplittedDecls );
114113 assertEquals (3 , aSplittedDecls .size ());
115114 assertEquals ("border-color:red" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
@@ -126,7 +125,7 @@ public void testMargin1 ()
126125 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("margin:1px" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
127126 assertNotNull (aDecl );
128127
129- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
128+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
130129 assertNotNull (aSplittedDecls );
131130 assertEquals (4 , aSplittedDecls .size ());
132131
@@ -145,7 +144,7 @@ public void testMargin2 ()
145144 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("margin:1px 3px" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
146145 assertNotNull (aDecl );
147146
148- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
147+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
149148 assertNotNull (aSplittedDecls );
150149 assertEquals (4 , aSplittedDecls .size ());
151150
@@ -165,7 +164,7 @@ public void testMargin3 ()
165164 .getDeclarationAtIndex (0 );
166165 assertNotNull (aDecl );
167166
168- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
167+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
169168 assertNotNull (aSplittedDecls );
170169 assertEquals (4 , aSplittedDecls .size ());
171170
@@ -185,7 +184,7 @@ public void testMargin4 ()
185184 .getDeclarationAtIndex (0 );
186185 assertNotNull (aDecl );
187186
188- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
187+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
189188 assertNotNull (aSplittedDecls );
190189 assertEquals (4 , aSplittedDecls .size ());
191190
@@ -204,7 +203,7 @@ public void testPadding1 ()
204203 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("padding:1px" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
205204 assertNotNull (aDecl );
206205
207- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
206+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
208207 assertNotNull (aSplittedDecls );
209208 assertEquals (4 , aSplittedDecls .size ());
210209
@@ -223,7 +222,7 @@ public void testPadding2 ()
223222 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("padding:1px 3px" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
224223 assertNotNull (aDecl );
225224
226- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
225+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
227226 assertNotNull (aSplittedDecls );
228227 assertEquals (4 , aSplittedDecls .size ());
229228
@@ -243,7 +242,7 @@ public void testPadding3 ()
243242 .getDeclarationAtIndex (0 );
244243 assertNotNull (aDecl );
245244
246- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
245+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
247246 assertNotNull (aSplittedDecls );
248247 assertEquals (4 , aSplittedDecls .size ());
249248
@@ -263,7 +262,7 @@ public void testPadding4 ()
263262 .getDeclarationAtIndex (0 );
264263 assertNotNull (aDecl );
265264
266- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
265+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
267266 assertNotNull (aSplittedDecls );
268267 assertEquals (4 , aSplittedDecls .size ());
269268
@@ -284,7 +283,7 @@ public void testBackground1 ()
284283 .getDeclarationAtIndex (0 );
285284 assertNotNull (aDecl );
286285
287- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
286+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
288287 assertNotNull (aSplittedDecls );
289288 assertEquals (8 , aSplittedDecls .size ());
290289
@@ -307,7 +306,7 @@ public void testBorderColor1 ()
307306 final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border-color: red" , ECSSVersion .CSS30 ).getDeclarationAtIndex (0 );
308307 assertNotNull (aDecl );
309308
310- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
309+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
311310 assertNotNull (aSplittedDecls );
312311 assertEquals (4 , aSplittedDecls .size ());
313312 assertEquals ("border-top-color:red" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
@@ -326,12 +325,88 @@ public void testBorderColor2 ()
326325 .getDeclarationAtIndex (0 );
327326 assertNotNull (aDecl );
328327
329- final List <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
328+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
330329 assertNotNull (aSplittedDecls );
331330 assertEquals (4 , aSplittedDecls .size ());
332331 assertEquals ("border-top-color:red" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
333332 assertEquals ("border-right-color:blue" , aSplittedDecls .get (1 ).getAsCSSString (CWS ));
334333 assertEquals ("border-bottom-color:red" , aSplittedDecls .get (2 ).getAsCSSString (CWS ));
335334 assertEquals ("border-left-color:blue" , aSplittedDecls .get (3 ).getAsCSSString (CWS ));
336335 }
336+
337+ @ Test
338+ public void testBorderWidth1 ()
339+ {
340+ final CSSShortHandDescriptor aSHD = CSSShortHandRegistry .getShortHandDescriptor (ECSSProperty .BORDER_WIDTH );
341+ assertNotNull (aSHD );
342+
343+ final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border-width: thick" , ECSSVersion .CSS30 )
344+ .getDeclarationAtIndex (0 );
345+ assertNotNull (aDecl );
346+
347+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
348+ assertNotNull (aSplittedDecls );
349+ assertEquals (4 , aSplittedDecls .size ());
350+ assertEquals ("border-top-width:thick" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
351+ assertEquals ("border-right-width:thick" , aSplittedDecls .get (1 ).getAsCSSString (CWS ));
352+ assertEquals ("border-bottom-width:thick" , aSplittedDecls .get (2 ).getAsCSSString (CWS ));
353+ assertEquals ("border-left-width:thick" , aSplittedDecls .get (3 ).getAsCSSString (CWS ));
354+ }
355+
356+ @ Test
357+ public void testBorderWidth2 ()
358+ {
359+ final CSSShortHandDescriptor aSHD = CSSShortHandRegistry .getShortHandDescriptor (ECSSProperty .BORDER_WIDTH );
360+ assertNotNull (aSHD );
361+
362+ final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border-width: 1px 3rem" , ECSSVersion .CSS30 )
363+ .getDeclarationAtIndex (0 );
364+ assertNotNull (aDecl );
365+
366+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
367+ assertNotNull (aSplittedDecls );
368+ assertEquals (4 , aSplittedDecls .size ());
369+ assertEquals ("border-top-width:1px" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
370+ assertEquals ("border-right-width:3rem" , aSplittedDecls .get (1 ).getAsCSSString (CWS ));
371+ assertEquals ("border-bottom-width:1px" , aSplittedDecls .get (2 ).getAsCSSString (CWS ));
372+ assertEquals ("border-left-width:3rem" , aSplittedDecls .get (3 ).getAsCSSString (CWS ));
373+ }
374+
375+ @ Test
376+ public void testBorderWidth3 ()
377+ {
378+ final CSSShortHandDescriptor aSHD = CSSShortHandRegistry .getShortHandDescriptor (ECSSProperty .BORDER_WIDTH );
379+ assertNotNull (aSHD );
380+
381+ final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border-width: 1px 3rem 4px" , ECSSVersion .CSS30 )
382+ .getDeclarationAtIndex (0 );
383+ assertNotNull (aDecl );
384+
385+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
386+ assertNotNull (aSplittedDecls );
387+ assertEquals (4 , aSplittedDecls .size ());
388+ assertEquals ("border-top-width:1px" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
389+ assertEquals ("border-right-width:3rem" , aSplittedDecls .get (1 ).getAsCSSString (CWS ));
390+ assertEquals ("border-bottom-width:4px" , aSplittedDecls .get (2 ).getAsCSSString (CWS ));
391+ assertEquals ("border-left-width:3rem" , aSplittedDecls .get (3 ).getAsCSSString (CWS ));
392+ }
393+
394+ @ Test
395+ public void testBorderWidth4 ()
396+ {
397+ final CSSShortHandDescriptor aSHD = CSSShortHandRegistry .getShortHandDescriptor (ECSSProperty .BORDER_WIDTH );
398+ assertNotNull (aSHD );
399+
400+ final CSSDeclaration aDecl = CSSReaderDeclarationList .readFromString ("border-width: 1px 3rem 4px thick" , ECSSVersion .CSS30 )
401+ .getDeclarationAtIndex (0 );
402+ assertNotNull (aDecl );
403+
404+ final ICommonsList <CSSDeclaration > aSplittedDecls = aSHD .getSplitIntoPieces (aDecl );
405+ assertNotNull (aSplittedDecls );
406+ assertEquals (4 , aSplittedDecls .size ());
407+ assertEquals ("border-top-width:1px" , aSplittedDecls .get (0 ).getAsCSSString (CWS ));
408+ assertEquals ("border-right-width:3rem" , aSplittedDecls .get (1 ).getAsCSSString (CWS ));
409+ assertEquals ("border-bottom-width:4px" , aSplittedDecls .get (2 ).getAsCSSString (CWS ));
410+ assertEquals ("border-left-width:thick" , aSplittedDecls .get (3 ).getAsCSSString (CWS ));
411+ }
337412}
0 commit comments