Dart: Removes name conflicts from generated bindings.

mojo/dart/test/validation_test.dart

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:isolate';
 import 'dart:typed_data';
 import 'mojo:bindings';
 import 'mojo:builtin' as builtin;
 import 'mojo:core';
 
 import 'package:mojo/dart/testing/validation_test_input_parser.dart' as parser;
 import 'package:mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.dart';
 
-class ConfrmanceTestInterfaceImpl extends ConformanceTestInterface {
+class ConfrmanceTestInterfaceImpl implements ConformanceTestInterface {
+  ConformanceTestInterfaceStub _stub;
   Completer _completer;
 
-  ConfrmanceTestInterfaceImpl(this._completer, MojoMessagePipeEndpoint endpoint)
-      : super(endpoint) {
-    super.delegate = this;
+  ConfrmanceTestInterfaceImpl(this._completer,

[sky, 2015/02/26 18:21:15]

You've got a mispelling here.

[zra, 2015/02/26 19:58:29]

Fixed.

+                              MojoMessagePipeEndpoint endpoint) {
+    _stub = new ConformanceTestInterfaceStub.fromEndpoint(endpoint)
+            ..delegate = this
+            ..listen();
   }
 
   void _complete() => _completer.complete(null);
 
   method0(double param0) => _complete();
   method1(StructA param0) => _complete();
   method2(StructB param0, StructA param1) => _complete();
   method3(List<bool> param0) => _complete();
   method4(StructC param0, List<int> param1) => _complete();
   method5(StructE param0, MojoDataPipeProducer param1) => _complete();
   method6(List<List<int>> param0) => _complete();
   method7(StructF param0, List<List<int>> param1) => _complete();
   method8(List<List<String>> param0) => _complete();
   method9(List<List<MojoHandle>> param0) => _complete();
   method10(Map<String, int> param0) => _complete();
+
+  void close({bool nodefer : false}) => _stub.close(nodefer: nodefer);
 }
 
 parser.ValidationParseResult readAndParseTest(String test) {
   List<int> data = builtin.readSync("${test}.data");
   String input = new Utf8Decoder().convert(data).trim();
   return parser.parse(input);
 }
 
 String expectedResult(String test) {
   List<int> data = builtin.readSync("${test}.expected");
   return new Utf8Decoder().convert(data).trim();
 }
 
 runTest(String name, parser.ValidationParseResult test, String expected) {
   var handles = new List.generate(test.numHandles,
       (_) => new MojoSharedBuffer.create(10).handle);
   var pipe = new MojoMessagePipe();
   var completer = new Completer();
-  var conformanceImpl = new ConfrmanceTestInterfaceImpl(
-      completer, pipe.endpoints[0]);
+  var conformanceImpl;
 
   runZoned(() {
-    conformanceImpl.listen();
+    conformanceImpl = new ConfrmanceTestInterfaceImpl(
+        completer, pipe.endpoints[0]);
   },
   onError: (e, stackTrace) {
     assert(e is MojoCodecError);
     // TODO(zra): Make the error messages conform?
     // assert(e == expected);
     conformanceImpl.close(nodefer: true);
     pipe.endpoints[0].handle.close();
     handles.forEach((h) => h.close());
   });
 
@@ skipping 23 matching lines @@
 
   // First test the parser.
   parser.parserTests();
 
   // Then run the conformance tests.
   getTestFiles(path, "$path/conformance_").forEach((test) {
     runTest(test, readAndParseTest(test), expectedResult(test));
   });
   // TODO(zra): Add integration tests when they no longer rely on Client=.
 }