Skip to content

Commit a0f627c

Browse files
rbrirbri
committed
bring import url closer to the browser
1 parent 00b2ce2 commit a0f627c

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String getCssText() {
6060

6161
final String href = getHref();
6262
if (null != href) {
63-
sb.append(" url(").append(href).append(")");
63+
sb.append(" url(\"").append(href).append("\")");
6464
}
6565

6666
final MediaListImpl ml = getMedia();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void test() throws Exception {
5959
Assert.assertEquals(3, rules.getLength());
6060

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

6565
stylesheet.deleteRule(1);

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public class CSSImportRuleImplTest {
3636
public void getCssText() throws Exception {
3737
final CSSImportRuleImpl value = parseImportRule("@import \"ext.css\";");
3838

39-
Assert.assertEquals("@import url(ext.css);", value.getCssText());
40-
Assert.assertEquals("@import url(ext.css);", value.toString());
39+
Assert.assertEquals("@import url(\"ext.css\");", value.getCssText());
40+
Assert.assertEquals("@import url(\"ext.css\");", value.toString());
4141
}
4242

4343
/**
@@ -47,12 +47,12 @@ public void getCssText() throws Exception {
4747
public void setCssText() throws Exception {
4848
final CSSImportRuleImpl value = parseImportRule("@import \"ext.css\";");
4949

50-
Assert.assertEquals("@import url(ext.css);", value.getCssText());
51-
Assert.assertEquals("@import url(ext.css);", value.toString());
50+
Assert.assertEquals("@import url(\"ext.css\");", value.getCssText());
51+
Assert.assertEquals("@import url(\"ext.css\");", value.toString());
5252

53-
value.setCssText("@import url(cool.css);");
54-
Assert.assertEquals("@import url(cool.css);", value.getCssText());
55-
Assert.assertEquals("@import url(cool.css);", value.toString());
53+
value.setCssText("@import url(\"cool.css\");");
54+
Assert.assertEquals("@import url(\"cool.css\");", value.getCssText());
55+
Assert.assertEquals("@import url(\"cool.css\");", value.toString());
5656

5757
}
5858

@@ -90,7 +90,7 @@ private CSSImportRuleImpl parseImportRule(final String rule) throws Exception {
9090
public void getCssTextFormated() throws Exception {
9191
final CSSImportRuleImpl value = parseImportRule("@import \"ext.css\";");
9292

93-
Assert.assertEquals("@import url(ext.css);", value.toString());
94-
Assert.assertEquals("@import url(ext.css);", value.getCssText());
93+
Assert.assertEquals("@import url(\"ext.css\");", value.toString());
94+
Assert.assertEquals("@import url(\"ext.css\");", value.getCssText());
9595
}
9696
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ public void charsetImportBefore() throws Exception {
398398
Assert.assertEquals(3, rules.getLength());
399399

400400
AbstractCSSRuleImpl rule = rules.getRules().get(0);
401-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
401+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
402402

403403
rule = rules.getRules().get(1);
404404
Assert.assertEquals("h1 { color: blue }", rule.getCssText());
@@ -424,7 +424,7 @@ public void charsetImportBeforeSkipComment() throws Exception {
424424
Assert.assertEquals(3, rules.getLength());
425425

426426
AbstractCSSRuleImpl rule = rules.getRules().get(0);
427-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
427+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
428428

429429
rule = rules.getRules().get(1);
430430
Assert.assertEquals("h1 { color: blue }", rule.getCssText());
@@ -449,7 +449,7 @@ public void charsetImportBeforeBrokenCharset() throws Exception {
449449
Assert.assertEquals(2, rules.getLength());
450450

451451
AbstractCSSRuleImpl rule = rules.getRules().get(0);
452-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
452+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
453453

454454
rule = rules.getRules().get(1);
455455
Assert.assertEquals("h2 { color: red }", rule.getCssText());
@@ -468,7 +468,7 @@ public void importRuleOnly() throws Exception {
468468
Assert.assertEquals(1, rules.getLength());
469469

470470
final AbstractCSSRuleImpl rule = rules.getRules().get(0);
471-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
471+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
472472
}
473473

474474
/**
@@ -484,13 +484,13 @@ public void importRulesOnly() throws Exception {
484484
Assert.assertEquals(3, rules.getLength());
485485

486486
AbstractCSSRuleImpl rule = rules.getRules().get(0);
487-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
487+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
488488

489489
rule = rules.getRules().get(1);
490-
Assert.assertEquals("@import url(subs1.css);", rule.getCssText());
490+
Assert.assertEquals("@import url(\"subs1.css\");", rule.getCssText());
491491

492492
rule = rules.getRules().get(2);
493-
Assert.assertEquals("@import url(subs2.css);", rule.getCssText());
493+
Assert.assertEquals("@import url(\"subs2.css\");", rule.getCssText());
494494
}
495495

496496
/**
@@ -761,7 +761,7 @@ public void atRules1() throws Exception {
761761
Assert.assertEquals(3, rules.getLength());
762762

763763
AbstractCSSRuleImpl rule = rules.getRules().get(0);
764-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
764+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
765765

766766
rule = rules.getRules().get(1);
767767
Assert.assertEquals("h1 { color: blue }", rule.getCssText());
@@ -807,7 +807,7 @@ public void atRules2() throws Exception {
807807
Assert.assertEquals(3, rules.getLength());
808808

809809
AbstractCSSRuleImpl rule = rules.getRules().get(0);
810-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
810+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
811811

812812
rule = rules.getRules().get(1);
813813
Assert.assertEquals("@media print {body { font-size: 10pt } }", rule.getCssText());
@@ -852,7 +852,7 @@ public void atRules2b() throws Exception {
852852
Assert.assertEquals(3, rules.getLength());
853853

854854
AbstractCSSRuleImpl rule = rules.getRules().get(0);
855-
Assert.assertEquals("@import url(subs.css);", rule.getCssText());
855+
Assert.assertEquals("@import url(\"subs.css\");", rule.getCssText());
856856

857857
rule = rules.getRules().get(1);
858858
Assert.assertEquals("@media print {body { font-size: 10pt } }", rule.getCssText());

0 commit comments

Comments
 (0)