Version 1.7.0-dev.3.3

editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/constant/ConstantValueComputerTest.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 17 matching lines @@
 import com.google.dart.engine.constant.DeclaredVariables;
 import com.google.dart.engine.context.AnalysisException;
 import com.google.dart.engine.element.ConstructorElement;
 import com.google.dart.engine.element.LibraryElement;
 import com.google.dart.engine.element.ParameterElement;
 import com.google.dart.engine.error.CompileTimeErrorCode;
 import com.google.dart.engine.error.ErrorCode;
 import com.google.dart.engine.internal.element.VariableElementImpl;
 import com.google.dart.engine.internal.object.DartObjectImpl;
 import com.google.dart.engine.internal.object.GenericState;
-import com.google.dart.engine.internal.resolver.TestTypeProvider;
 import com.google.dart.engine.internal.resolver.TypeProvider;
 import com.google.dart.engine.resolver.ResolverTestCase;
 import com.google.dart.engine.source.Source;
 import com.google.dart.engine.utilities.collection.DirectedGraph;
 import com.google.dart.engine.utilities.logging.TestLogger;
 
 import java.util.HashMap;
 
 public class ConstantValueComputerTest extends ResolverTestCase {
   class ValidatingConstantVisitor extends ConstantVisitor {
@@ skipping 115 matching lines @@
 
     ConstantValueComputer computer = makeConstantValueComputer();
     computer.add(unit);
     computer.computeValues();
     NodeList<CompilationUnitMember> members = unit.getDeclarations();
     assertSizeOfList(2, members);
     validate(true, ((TopLevelVariableDeclaration) members.get(0)).getVariables());
     validate(true, ((TopLevelVariableDeclaration) members.get(1)).getVariables());
   }
 
-  public void test_computeValues_empty() {
+  public void test_computeValues_empty() throws Exception {
     ConstantValueComputer computer = makeConstantValueComputer();
     computer.computeValues();
   }
 
   public void test_computeValues_multipleSources() throws Exception {
     Source librarySource = addNamedSource("/lib.dart", createSource(//
         "library lib;",
         "part 'part.dart';",
         "const int c = b;",
         "const int a = 0;"));
@@ skipping 743 matching lines @@
     assertSizeOfMap(1, fieldsOfY);
     assertIntField(fieldsOfY, fieldName, 10L);
   }
 
   private EvaluationResultImpl evaluateInstanceCreationExpression(CompilationUnit compilationUnit,
       String name) throws AnalysisException {
     Expression expression = findTopLevelConstantExpression(compilationUnit, name);
     return ((InstanceCreationExpression) expression).getEvaluationResult();
   }
 
-  private ConstantValueComputer makeConstantValueComputer() {
+  private ConstantValueComputer makeConstantValueComputer() throws AnalysisException {
     return new ValidatingConstantValueComputer(
-        new TestTypeProvider(),
+        analysisContext.getTypeProvider(),
         analysisContext.getDeclaredVariables());
   }
 
   private void validate(boolean shouldBeValid, VariableDeclarationList declarationList) {
     for (VariableDeclaration declaration : declarationList.getVariables()) {
       VariableElementImpl element = (VariableElementImpl) declaration.getElement();
       assertNotNull(element);
       EvaluationResultImpl result = element.getEvaluationResult();
       if (shouldBeValid) {
         assertInstanceOf(ValidResult.class, result);
         Object value = ((ValidResult) result).getValue();
         assertNotNull(value);
       } else {
         assertInstanceOf(ErrorResult.class, result);
       }
     }
   }
 }