Improved HTML parsing

editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/cache/HtmlEntryImplTest.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 14 matching lines @@
 
 public class HtmlEntryImplTest extends EngineTestCase {
   public void test_creation() {
     HtmlEntryImpl entry = new HtmlEntryImpl();
     assertNotNull(entry);
   }
 
   public void test_getAllErrors() {
     Source source = new TestSource();
     HtmlEntryImpl entry = new HtmlEntryImpl();
     assertLength(0, entry.getAllErrors());

[danrubel, 2013/11/25 02:26:12]

add a parse error here and validate here to assert that getAllErrors includes
parse errors

     entry.setValue(HtmlEntry.RESOLUTION_ERRORS, new AnalysisError[] {new AnalysisError(
         source,
         HtmlWarningCode.INVALID_URI,
         "-")});
     entry.setValue(HtmlEntry.HINTS, new AnalysisError[] {new AnalysisError(
         source,
         HintCode.DEAD_CODE)});
     assertLength(2, entry.getAllErrors());
   }
 
   public void test_getWritableCopy() {
     HtmlEntryImpl entry = new HtmlEntryImpl();
     HtmlEntryImpl copy = entry.getWritableCopy();
     assertNotNull(copy);
     assertNotSame(entry, copy);
   }
 
   public void test_invalidateAllResolutionInformation() {
     HtmlEntryImpl entry = entryWithValidState();
     entry.invalidateAllResolutionInformation();
     assertSame(CacheState.INVALID, entry.getState(HtmlEntry.ELEMENT));
     assertSame(CacheState.INVALID, entry.getState(HtmlEntry.HINTS));
     assertSame(CacheState.VALID, entry.getState(SourceEntry.LINE_INFO));
     assertSame(CacheState.VALID, entry.getState(HtmlEntry.PARSED_UNIT));
     assertSame(CacheState.VALID, entry.getState(HtmlEntry.REFERENCED_LIBRARIES));
     assertSame(CacheState.INVALID, entry.getState(HtmlEntry.RESOLUTION_ERRORS));

[danrubel, 2013/11/25 02:26:12]

assertSame(CacheState.VALID, entry.getState(HtmlEntry.PARSE_ERRORS));

[Brian Wilkerson, 2013/11/25 19:04:36]

Done

   }
 
   public void test_setState_element() {
     setState(HtmlEntry.ELEMENT);
   }
 
   public void test_setState_hints() {
     setState(HtmlEntry.HINTS);
   }
 
   public void test_setState_lineInfo() {
     setState(SourceEntry.LINE_INFO);
   }
 
   public void test_setState_parsedUnit() {
     setState(HtmlEntry.PARSED_UNIT);
   }
 
+  public void test_setState_parseErrors() {
+    setState(HtmlEntry.PARSE_ERRORS);
+  }
+
   public void test_setState_referencedLibraries() {
     setState(HtmlEntry.REFERENCED_LIBRARIES);
   }
 
   public void test_setState_resolutionErrors() {
     setState(HtmlEntry.RESOLUTION_ERRORS);
   }
 
   public void test_setValue_element() {
     setValue(HtmlEntry.ELEMENT, new HtmlElementImpl(null, "test.html"));
@@ skipping 14 matching lines @@
   }
 
   public void test_setValue_lineInfo() {
     setValue(SourceEntry.LINE_INFO, new LineInfo(new int[] {0}));
   }
 
   public void test_setValue_parsedUnit() {
     setValue(HtmlEntry.PARSED_UNIT, new HtmlUnit(null, null, null));
   }
 
+  public void test_setValue_parseErrors() {
+    setValue(HtmlEntry.PARSE_ERRORS, new AnalysisError[] {new AnalysisError(
+        null,
+        HtmlWarningCode.INVALID_URI,
+        "-")});
+  }
+
   public void test_setValue_referencedLibraries() {
     setValue(HtmlEntry.REFERENCED_LIBRARIES, new Source[] {new TestSource()});
   }
 
   public void test_setValue_resolutionErrors() {
     setValue(HtmlEntry.RESOLUTION_ERRORS, new AnalysisError[] {new AnalysisError(
         null,
         HtmlWarningCode.INVALID_URI,
         "-")});
   }
 
   private HtmlEntryImpl entryWithValidState() {
     HtmlEntryImpl entry = new HtmlEntryImpl();
     entry.setValue(HtmlEntry.ELEMENT, null);
     entry.setValue(HtmlEntry.HINTS, null);

[danrubel, 2013/11/25 02:26:12]

entry.setValue(HtmlEntry.PARSE_ERRORS, null); 

[Brian Wilkerson, 2013/11/25 19:04:36]

Done

     entry.setValue(SourceEntry.LINE_INFO, null);
     entry.setValue(HtmlEntry.PARSED_UNIT, null);
     entry.setValue(HtmlEntry.REFERENCED_LIBRARIES, null);
     entry.setValue(HtmlEntry.RESOLUTION_ERRORS, null);
 
     assertSame(CacheState.VALID, entry.getState(HtmlEntry.ELEMENT));
     assertSame(CacheState.VALID, entry.getState(HtmlEntry.HINTS));
     assertSame(CacheState.VALID, entry.getState(SourceEntry.LINE_INFO));

[danrubel, 2013/11/25 02:26:12]

assertSame(CacheState.VALID, entry.getState(HtmlEntry.PARSE_ERRORS));

[Brian Wilkerson, 2013/11/25 19:04:36]

Done

     assertSame(CacheState.VALID, entry.getState(HtmlEntry.PARSED_UNIT));
     assertSame(CacheState.VALID, entry.getState(HtmlEntry.REFERENCED_LIBRARIES));
     assertSame(CacheState.VALID, entry.getState(HtmlEntry.RESOLUTION_ERRORS));
     return entry;
   }
 
   private void setState(DataDescriptor<?> descriptor) {
     HtmlEntryImpl entry = new HtmlEntryImpl();
     assertNotSame(CacheState.FLUSHED, entry.getState(descriptor));
     entry.setState(descriptor, CacheState.FLUSHED);
     assertSame(CacheState.FLUSHED, entry.getState(descriptor));
   }
 
   private <E> void setValue(DataDescriptor<E> descriptor, E newValue) {
     HtmlEntryImpl entry = new HtmlEntryImpl();
     E value = entry.getValue(descriptor);
     assertNotSame(value, newValue);
     entry.setValue(descriptor, newValue);
     assertSame(CacheState.VALID, entry.getState(descriptor));
     assertSame(newValue, entry.getValue(descriptor));
   }
 }