Skip to content

Commit fa6d25f

Browse files
rbrirbri
committed
bring formating closer to the browser
1 parent 26c9439 commit fa6d25f

File tree

12 files changed

+229
-229
lines changed

12 files changed

+229
-229
lines changed

‎src/main/java/com/gargoylesoftware/css/dom/CSSStyleRuleImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public String getCssText() {
7777
return selectorText + " { }";
7878
}
7979

80-
return selectorText + " { " + styleText + " }";
80+
return selectorText + " { " + styleText + "; }";
8181
}
8282

8383
/**

‎src/test/java/com/gargoylesoftware/css/DomTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void inheritGetStringValue() throws Exception {
144144
final CSSRuleListImpl rules = css.getCssRules();
145145
Assert.assertEquals(2, rules.getLength());
146146

147-
Assert.assertEquals("p { font-size: 2em }", rules.getRules().get(0).getCssText());
148-
Assert.assertEquals("p a:link { font-size: inherit }", rules.getRules().get(1).getCssText());
147+
Assert.assertEquals("p { font-size: 2em; }", rules.getRules().get(0).getCssText());
148+
Assert.assertEquals("p a:link { font-size: inherit; }", rules.getRules().get(1).getCssText());
149149
}
150150
}

‎src/test/java/com/gargoylesoftware/css/TestException.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,24 @@ public void test() throws Exception {
6060

6161
Assert.assertEquals("@charset \"US-ASCII\";", rules.getRules().get(0).getCssText());
6262
Assert.assertEquals("@import url(\"http://www.steadystate.com/primary.css\");", rules.getRules().get(1).getCssText());
63-
Assert.assertEquals("P { color: blue }", rules.getRules().get(2).getCssText());
63+
Assert.assertEquals("P { color: blue; }", rules.getRules().get(2).getCssText());
6464

6565
stylesheet.deleteRule(1);
6666

6767
Assert.assertEquals(2, rules.getLength());
6868
Assert.assertEquals("@charset \"US-ASCII\";", rules.getRules().get(0).getCssText());
69-
Assert.assertEquals("P { color: blue }", rules.getRules().get(1).getCssText());
69+
Assert.assertEquals("P { color: blue; }", rules.getRules().get(1).getCssText());
7070

7171
AbstractCSSRuleImpl rule = rules.getRules().get(1);
7272
rule.setCssText("h2 { smell: strong }");
73-
Assert.assertEquals("h2 { smell: strong }", rules.getRules().get(1).getCssText());
73+
Assert.assertEquals("h2 { smell: strong; }", rules.getRules().get(1).getCssText());
7474

7575
stylesheet.insertRule("@media speech { h1 { voice: male } }", 1);
7676

7777
Assert.assertEquals(3, rules.getLength());
7878
Assert.assertEquals("@charset \"US-ASCII\";", rules.getRules().get(0).getCssText());
79-
Assert.assertEquals("@media speech {\n h1 { voice: male }\n}", rules.getRules().get(1).getCssText());
80-
Assert.assertEquals("h2 { smell: strong }", rules.getRules().get(2).getCssText());
79+
Assert.assertEquals("@media speech {\n h1 { voice: male; }\n}", rules.getRules().get(1).getCssText());
80+
Assert.assertEquals("h2 { smell: strong; }", rules.getRules().get(2).getCssText());
8181

8282
rule = rules.getRules().get(1);
8383
((CSSMediaRuleImpl) rule).insertRule("p { voice: female }", 1);

‎src/test/java/com/gargoylesoftware/css/dom/CSSMediaRuleImplTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void getCssText() throws Exception {
4040
final CSSStyleSheetImpl ss = parser.parseStyleSheet(source, null);
4141
final CSSMediaRuleImpl mediaRule = (CSSMediaRuleImpl) ss.getCssRules().getRules().get(0);
4242

43-
Assert.assertEquals("@media print {\n body { font-size: 10pt }\n}", mediaRule.getCssText());
43+
Assert.assertEquals("@media print {\n body { font-size: 10pt; }\n}", mediaRule.getCssText());
4444
}
4545

4646
/**
@@ -54,22 +54,22 @@ public void insertRule() throws Exception {
5454
final CSSMediaRuleImpl mediaRule = (CSSMediaRuleImpl) ss.getCssRules().getRules().get(0);
5555

5656
mediaRule.insertRule(".testStyle { height: 42px; }", 0);
57-
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().getRules().get(0).getCssText());
57+
Assert.assertEquals("*.testStyle { height: 42px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
5858

5959
mediaRule.insertRule(".testStyle { height: 43px; }", 0);
60-
Assert.assertEquals("*.testStyle { height: 43px }", mediaRule.getCssRules().getRules().get(0).getCssText());
61-
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().getRules().get(1).getCssText());
60+
Assert.assertEquals("*.testStyle { height: 43px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
61+
Assert.assertEquals("*.testStyle { height: 42px; }", mediaRule.getCssRules().getRules().get(1).getCssText());
6262

6363
mediaRule.insertRule(".testStyle { height: 44px; }", 2);
64-
Assert.assertEquals("*.testStyle { height: 43px }", mediaRule.getCssRules().getRules().get(0).getCssText());
65-
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().getRules().get(1).getCssText());
66-
Assert.assertEquals("*.testStyle { height: 44px }", mediaRule.getCssRules().getRules().get(2).getCssText());
64+
Assert.assertEquals("*.testStyle { height: 43px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
65+
Assert.assertEquals("*.testStyle { height: 42px; }", mediaRule.getCssRules().getRules().get(1).getCssText());
66+
Assert.assertEquals("*.testStyle { height: 44px; }", mediaRule.getCssRules().getRules().get(2).getCssText());
6767

6868
mediaRule.insertRule(".testStyle { height: 45px; }", 2);
69-
Assert.assertEquals("*.testStyle { height: 43px }", mediaRule.getCssRules().getRules().get(0).getCssText());
70-
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().getRules().get(1).getCssText());
71-
Assert.assertEquals("*.testStyle { height: 45px }", mediaRule.getCssRules().getRules().get(2).getCssText());
72-
Assert.assertEquals("*.testStyle { height: 44px }", mediaRule.getCssRules().getRules().get(3).getCssText());
69+
Assert.assertEquals("*.testStyle { height: 43px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
70+
Assert.assertEquals("*.testStyle { height: 42px; }", mediaRule.getCssRules().getRules().get(1).getCssText());
71+
Assert.assertEquals("*.testStyle { height: 45px; }", mediaRule.getCssRules().getRules().get(2).getCssText());
72+
Assert.assertEquals("*.testStyle { height: 44px; }", mediaRule.getCssRules().getRules().get(3).getCssText());
7373
}
7474

7575
/**
@@ -85,16 +85,16 @@ public void insertRuleWithLeadingWhitespace() throws Exception {
8585
final CSSMediaRuleImpl mediaRule = (CSSMediaRuleImpl) ss.getCssRules().getRules().get(0);
8686

8787
mediaRule.insertRule(" .testStyleDef { height: 42px; }", 0);
88-
Assert.assertEquals("*.testStyleDef { height: 42px }", mediaRule.getCssRules().getRules().get(0).getCssText());
88+
Assert.assertEquals("*.testStyleDef { height: 42px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
8989

9090
mediaRule.insertRule(" .testStyleDef { height: 43px;} ", 0);
91-
Assert.assertEquals("*.testStyleDef { height: 43px }", mediaRule.getCssRules().getRules().get(0).getCssText());
92-
Assert.assertEquals("*.testStyleDef { height: 42px }", mediaRule.getCssRules().getRules().get(1).getCssText());
91+
Assert.assertEquals("*.testStyleDef { height: 43px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
92+
Assert.assertEquals("*.testStyleDef { height: 42px; }", mediaRule.getCssRules().getRules().get(1).getCssText());
9393

9494
mediaRule.insertRule("\t.testStyleDef { height: 44px; }\r\n", 0);
95-
Assert.assertEquals("*.testStyleDef { height: 44px }", mediaRule.getCssRules().getRules().get(0).getCssText());
96-
Assert.assertEquals("*.testStyleDef { height: 43px }", mediaRule.getCssRules().getRules().get(1).getCssText());
97-
Assert.assertEquals("*.testStyleDef { height: 42px }", mediaRule.getCssRules().getRules().get(2).getCssText());
95+
Assert.assertEquals("*.testStyleDef { height: 44px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
96+
Assert.assertEquals("*.testStyleDef { height: 43px; }", mediaRule.getCssRules().getRules().get(1).getCssText());
97+
Assert.assertEquals("*.testStyleDef { height: 42px; }", mediaRule.getCssRules().getRules().get(2).getCssText());
9898
}
9999

100100
/**
@@ -132,7 +132,7 @@ public void insertRuleNot() throws Exception {
132132
final CSSMediaRuleImpl mediaRule = (CSSMediaRuleImpl) ss.getCssRules().getRules().get(0);
133133

134134
mediaRule.insertRule("li:not(.shiny) { height: 44px }", 0);
135-
Assert.assertEquals("li:not(.shiny) { height: 44px }", mediaRule.getCssRules().getRules().get(0).getCssText());
135+
Assert.assertEquals("li:not(.shiny) { height: 44px; }", mediaRule.getCssRules().getRules().get(0).getCssText());
136136

137137
try {
138138
mediaRule.insertRule("li:not(*.shiny) { height: 44px }", 0);
@@ -188,6 +188,6 @@ public void asString() throws Exception {
188188
final CSSStyleSheetImpl ss = parser.parseStyleSheet(source, null);
189189
final CSSMediaRuleImpl mediaRule = (CSSMediaRuleImpl) ss.getCssRules().getRules().get(0);
190190

191-
Assert.assertEquals("@media print {\n body { font-size: 10pt }\n}", mediaRule.toString());
191+
Assert.assertEquals("@media print {\n body { font-size: 10pt; }\n}", mediaRule.toString());
192192
}
193193
}

‎src/test/java/com/gargoylesoftware/css/dom/CSSRuleListImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ private CSSRuleListImpl parseRuleList(final String rules) throws Exception {
7272
public void getCssTextFormated() throws Exception {
7373
final CSSRuleListImpl value = parseRuleList("h1 {} h2 {color:green}");
7474

75-
Assert.assertEquals("h1 { }\r\nh2 { color: green }", value.toString());
75+
Assert.assertEquals("h1 { }\r\nh2 { color: green; }", value.toString());
7676
}
7777
}

‎src/test/java/com/gargoylesoftware/css/dom/CSSStyleRuleImplTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public class CSSStyleRuleImplTest {
3636
public void getCssText() throws Exception {
3737
final CSSStyleRuleImpl value = parseStyleRule("h1 { color: blue }");
3838

39-
Assert.assertEquals("h1 { color: blue }", value.getCssText());
40-
Assert.assertEquals("h1 { color: blue }", value.toString());
39+
Assert.assertEquals("h1 { color: blue; }", value.getCssText());
40+
Assert.assertEquals("h1 { color: blue; }", value.toString());
4141
}
4242

4343
/**
@@ -47,12 +47,12 @@ public void getCssText() throws Exception {
4747
public void setCssText() throws Exception {
4848
final CSSStyleRuleImpl value = parseStyleRule("h1 { color: blue }");
4949

50-
Assert.assertEquals("h1 { color: blue }", value.getCssText());
51-
Assert.assertEquals("h1 { color: blue }", value.toString());
50+
Assert.assertEquals("h1 { color: blue; }", value.getCssText());
51+
Assert.assertEquals("h1 { color: blue; }", value.toString());
5252

53-
value.setCssText("p { width: 10px };");
54-
Assert.assertEquals("p { width: 10px }", value.getCssText());
55-
Assert.assertEquals("p { width: 10px }", value.toString());
53+
value.setCssText("p { width: 10px; };");
54+
Assert.assertEquals("p { width: 10px; }", value.getCssText());
55+
Assert.assertEquals("p { width: 10px; }", value.toString());
5656

5757
}
5858

@@ -93,7 +93,7 @@ private CSSStyleRuleImpl parseStyleRule(final String rule) throws Exception {
9393
public void getCssTextFormated() throws Exception {
9494
final CSSStyleRuleImpl value = parseStyleRule("h1{color:blue}");
9595

96-
Assert.assertEquals("h1 { color: blue }", value.toString());
97-
Assert.assertEquals("h1 { color: blue }", value.getCssText());
96+
Assert.assertEquals("h1 { color: blue; }", value.toString());
97+
Assert.assertEquals("h1 { color: blue; }", value.getCssText());
9898
}
9999
}

‎src/test/java/com/gargoylesoftware/css/dom/CSSStyleSheetImplTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ public void insertRule() throws Exception {
4242
final CSSStyleSheetImpl ss = parseStyleSheet("");
4343

4444
ss.insertRule(".testStyle { height: 42px; }", 0);
45-
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().getRules().get(0).getCssText());
45+
Assert.assertEquals("*.testStyle { height: 42px; }", ss.getCssRules().getRules().get(0).getCssText());
4646

4747
ss.insertRule(".testStyle { height: 43px; }", 0);
48-
Assert.assertEquals("*.testStyle { height: 43px }", ss.getCssRules().getRules().get(0).getCssText());
49-
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().getRules().get(1).getCssText());
48+
Assert.assertEquals("*.testStyle { height: 43px; }", ss.getCssRules().getRules().get(0).getCssText());
49+
Assert.assertEquals("*.testStyle { height: 42px; }", ss.getCssRules().getRules().get(1).getCssText());
5050

5151
ss.insertRule(".testStyle { height: 44px; }", 2);
52-
Assert.assertEquals("*.testStyle { height: 43px }", ss.getCssRules().getRules().get(0).getCssText());
53-
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().getRules().get(1).getCssText());
54-
Assert.assertEquals("*.testStyle { height: 44px }", ss.getCssRules().getRules().get(2).getCssText());
52+
Assert.assertEquals("*.testStyle { height: 43px; }", ss.getCssRules().getRules().get(0).getCssText());
53+
Assert.assertEquals("*.testStyle { height: 42px; }", ss.getCssRules().getRules().get(1).getCssText());
54+
Assert.assertEquals("*.testStyle { height: 44px; }", ss.getCssRules().getRules().get(2).getCssText());
5555

5656
ss.insertRule(".testStyle { height: 45px; }", 2);
57-
Assert.assertEquals("*.testStyle { height: 43px }", ss.getCssRules().getRules().get(0).getCssText());
58-
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().getRules().get(1).getCssText());
59-
Assert.assertEquals("*.testStyle { height: 45px }", ss.getCssRules().getRules().get(2).getCssText());
60-
Assert.assertEquals("*.testStyle { height: 44px }", ss.getCssRules().getRules().get(3).getCssText());
57+
Assert.assertEquals("*.testStyle { height: 43px; }", ss.getCssRules().getRules().get(0).getCssText());
58+
Assert.assertEquals("*.testStyle { height: 42px; }", ss.getCssRules().getRules().get(1).getCssText());
59+
Assert.assertEquals("*.testStyle { height: 45px; }", ss.getCssRules().getRules().get(2).getCssText());
60+
Assert.assertEquals("*.testStyle { height: 44px; }", ss.getCssRules().getRules().get(3).getCssText());
6161
}
6262

6363
/**
@@ -70,16 +70,16 @@ public void insertRuleWithLeadingWhitespace() throws Exception {
7070
final CSSStyleSheetImpl ss = parseStyleSheet("");
7171

7272
ss.insertRule(" .testStyleDef { height: 42px; }", 0);
73-
Assert.assertEquals("*.testStyleDef { height: 42px }", ss.getCssRules().getRules().get(0).getCssText());
73+
Assert.assertEquals("*.testStyleDef { height: 42px; }", ss.getCssRules().getRules().get(0).getCssText());
7474

7575
ss.insertRule(" .testStyleDef { height: 43px;} ", 0);
76-
Assert.assertEquals("*.testStyleDef { height: 43px }", ss.getCssRules().getRules().get(0).getCssText());
77-
Assert.assertEquals("*.testStyleDef { height: 42px }", ss.getCssRules().getRules().get(1).getCssText());
76+
Assert.assertEquals("*.testStyleDef { height: 43px; }", ss.getCssRules().getRules().get(0).getCssText());
77+
Assert.assertEquals("*.testStyleDef { height: 42px; }", ss.getCssRules().getRules().get(1).getCssText());
7878

79-
ss.insertRule("\t.testStyleDef { height: 44px; }\r\n", 0);
80-
Assert.assertEquals("*.testStyleDef { height: 44px }", ss.getCssRules().getRules().get(0).getCssText());
81-
Assert.assertEquals("*.testStyleDef { height: 43px }", ss.getCssRules().getRules().get(1).getCssText());
82-
Assert.assertEquals("*.testStyleDef { height: 42px }", ss.getCssRules().getRules().get(2).getCssText());
79+
ss.insertRule("\t.testStyleDef { height: 44px }\r\n", 0);
80+
Assert.assertEquals("*.testStyleDef { height: 44px; }", ss.getCssRules().getRules().get(0).getCssText());
81+
Assert.assertEquals("*.testStyleDef { height: 43px; }", ss.getCssRules().getRules().get(1).getCssText());
82+
Assert.assertEquals("*.testStyleDef { height: 42px; }", ss.getCssRules().getRules().get(2).getCssText());
8383
}
8484

8585
/**
@@ -214,6 +214,6 @@ private CSSStyleSheetImpl parseStyleSheet(final String rule) throws Exception {
214214
public void getCssTextFormated() throws Exception {
215215
final CSSStyleSheetImpl value = parseStyleSheet("h1{color:blue}");
216216

217-
Assert.assertEquals("h1 { color: blue }", value.toString());
217+
Assert.assertEquals("h1 { color: blue; }", value.toString());
218218
}
219219
}

‎src/test/java/com/gargoylesoftware/css/dom/RectImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void constructByLUTooManyValuesException() throws Exception {
164164
*/
165165
@Test
166166
public void parseRule() throws Exception {
167-
final String testRule = "img { clip: rect(1px, 2px, -3px, 4px) }";
167+
final String testRule = "img { clip: rect(1px, 2px, -3px, 4px); }";
168168
final AbstractCSSRuleImpl rule = new CSSOMParser().parseRule(testRule);
169169

170170
Assert.assertEquals(testRule, rule.getCssText());

‎src/test/java/com/gargoylesoftware/css/parser/AbstractCSSParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ protected CSSStyleSheetImpl checkErrorSheet(final String input, final String err
289289
}
290290

291291
protected CSSValueImpl dimension(final String dim) throws Exception {
292-
final String css = "*.dim { top: " + dim + " }";
292+
final String css = "*.dim { top: " + dim + "; }";
293293

294294
final CSSStyleSheetImpl sheet = parse(css);
295295
final CSSRuleListImpl rules = sheet.getCssRules();

0 commit comments

Comments
 (0)