[csseditor-cvs] net.sourceforge.csseditor.tests/src/net/sourceforge/csseditor/tests/internal/parser CssParserDeclarationTest.java,1.2,1.3

[<ce...@us...>]

Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests/src/net/sourceforge/csseditor/tests/internal/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv13038/src/net/sourceforge/csseditor/tests/internal/parser

Modified Files:
	CssParserDeclarationTest.java 
Log Message:
- Fix for Bug #873886 [URL containing a semicolon terminates style declaration]
- Removed unneeded this qualifiers in test case

Index: CssParserDeclarationTest.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/src/net/sourceforge/csseditor/tests/internal/parser/CssParserDeclarationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssParserDeclarationTest.java	27 Dec 2003 18:56:38 -0000	1.2
--- CssParserDeclarationTest.java	11 Jan 2004 19:15:28 -0000	1.3
***************
*** 22,33 ****
      public void testParseEmptyDeclaration() throws Exception {
          setInput("");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertNull(declaration);
          assertNoProblemsReported();
      }
  
      public void testDeclarationWithOnlyASemicolon() throws Exception {
          setInput(":");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, ":");
          assertNull(declaration.getProperty());
--- 22,45 ----
      public void testParseEmptyDeclaration() throws Exception {
          setInput("");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertNull(declaration);
          assertNoProblemsReported();
      }
  
+     public void testDeclarationWithOnlyAColon() throws Exception {
+         setInput(":");
+         IDeclaration declaration = parser.parseDeclaration(null);
+         assertReferenceIs(declaration, 0, ":");
+         assertNull(declaration.getProperty());
+         assertNull(declaration.getValue());
+         assertNull(declaration.getPriority());
+         assertProblemsReported(2);
+         assertErrorReported(0, "expectedProperty", 0, 1);
+         assertErrorReported(1, "emptyDeclarationValue", 1, 1);
+     }
+ 
      public void testDeclarationWithOnlyASemicolon() throws Exception {
          setInput(":");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, ":");
          assertNull(declaration.getProperty());
***************
*** 41,45 ****
      public void testParseDeclarationWithOnlyAProperty() throws Exception {
          setInput("property");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 53,57 ----
      public void testParseDeclarationWithOnlyAProperty() throws Exception {
          setInput("property");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 54,58 ****
          throws Exception {
          setInput("property:");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property:");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 66,70 ----
          throws Exception {
          setInput("property:");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property:");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 66,70 ****
          throws Exception {
          setInput("property;");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 78,82 ----
          throws Exception {
          setInput("property;");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 78,82 ****
      public void testParseDeclarationWithSimpleValue() throws Exception {
          setInput("property: value");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 90,94 ----
      public void testParseDeclarationWithSimpleValue() throws Exception {
          setInput("property: value");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 88,92 ****
      public void testParseDeclarationWithoutColon() throws Exception {
          setInput("property value");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 100,104 ----
      public void testParseDeclarationWithoutColon() throws Exception {
          setInput("property value");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 100,104 ****
          throws Exception {
          setInput("property: value;");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 112,116 ----
          throws Exception {
          setInput("property: value;");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 110,114 ****
      public void testParseDeclarationEndedByClosingBrace() throws Exception {
          setInput("property: value }");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 122,126 ----
      public void testParseDeclarationEndedByClosingBrace() throws Exception {
          setInput("property: value }");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 120,124 ****
      public void testParseDeclarationWithMultipleValues() throws Exception {
          setInput("property: value1 value2 value3");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value1 value2 value3");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 132,136 ----
      public void testParseDeclarationWithMultipleValues() throws Exception {
          setInput("property: value1 value2 value3");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value1 value2 value3");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 130,134 ****
      public void testParseDeclarationWithPriority() throws Exception {
          setInput("property: value !priority");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value !priority");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 142,146 ----
      public void testParseDeclarationWithPriority() throws Exception {
          setInput("property: value !priority");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value !priority");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 140,144 ****
      public void testParseDeclarationWithExclamationMark() throws Exception {
          setInput("property: value !");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value !");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 152,156 ----
      public void testParseDeclarationWithExclamationMark() throws Exception {
          setInput("property: value !");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: value !");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 152,156 ****
          throws Exception {
          setInput("property: !priority");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: !priority");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 164,168 ----
          throws Exception {
          setInput("property: !priority");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: !priority");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 164,168 ****
          throws Exception {
          setInput("property: function(");
!         IDeclaration declaration = this.parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: function(");
          assertReferenceIs(declaration.getProperty(), 0, "property");
--- 176,180 ----
          throws Exception {
          setInput("property: function(");
!         IDeclaration declaration = parser.parseDeclaration(null);
          assertReferenceIs(declaration, 0, "property: function(");
          assertReferenceIs(declaration.getProperty(), 0, "property");
***************
*** 171,174 ****
--- 183,197 ----
          assertProblemsReported(1);
          assertErrorReported(0, "expectedToken", 19, 19);
+     }
+ 
+     public void testParseDeclarationWithSemicolonInParenthesis()
+         throws Exception {
+         setInput("property: function(;)");
+         IDeclaration declaration = parser.parseDeclaration(null);
+         assertReferenceIs(declaration, 0, "property: function(;)");
+         assertReferenceIs(declaration.getProperty(), 0, "property");
+         assertReferenceIs(declaration.getValue(), 10, "function(;)");
+         assertNull(declaration.getPriority());
+         assertNoProblemsReported();
      }