pkg/polymer/test/build/common.dart - Issue 335943003: merge to trunk all changes from 36817 until 37378 under the packages: polymer,

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pkg/polymer/test/build/common.dart

Issue 335943003: merge to trunk all changes from 36817 until 37378 under the packages: polymer, (Closed) Base URL: http://dart.googlecode.com/svn/trunk/dart/

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pkg/polymer/test/build/common.dart

===================================================================

--- pkg/polymer/test/build/common.dart (revision 37373)

+++ pkg/polymer/test/build/common.dart (working copy)

@@ -75,9 +75,10 @@

var span = entry.span;

var spanInfo = span == null ? '' :

' (${span.sourceUrl} ${span.start.line} ${span.start.column})';

- expect(messagesSeen, lessThan(messages.length),

+ var index = messagesSeen++;

+ expect(messagesSeen, lessThanOrEqualTo(messages.length),

reason: 'more messages than expected.\nMessage seen: $msg$spanInfo');

- expect('$msg$spanInfo', messages[messagesSeen++]);

+ expect('$msg$spanInfo', messages[index]);

});

}

@@ -118,7 +119,7 @@

}).then((_) {

// We only check messages when an expectation is provided.

if (messages == null) return;

- expect(messages.length, messagesSeen,

+ expect(messagesSeen, messages.length,

reason: 'less messages than expected');

});

}

@@ -160,8 +161,12 @@

const DART_JS_TAG = '<script src="packages/browser/dart.js"></script>';

const POLYMER_MOCKS = const {

- 'polymer|lib/polymer.html': '<!DOCTYPE html><html>',

- 'polymer|lib/polymer_experimental.html': '<!DOCTYPE html><html>',

+ 'polymer|lib/src/js/polymer/polymer.html': '<!DOCTYPE html><html>',

+ 'polymer|lib/polymer.html': '<!DOCTYPE html><html>'

+ '<link rel="import" href="src/js/polymer/polymer.html">',

+ 'polymer|lib/polymer_experimental.html':

+ '<!DOCTYPE html><html>'

+ '<link rel="import" href="polymer.html">',

'polymer|lib/polymer.dart':

'library polymer;\n'

'import "dart:html";\n'

« no previous file with comments | « pkg/polymer/test/build/code_extractor.dart ('k') | pkg/polymer/test/build/import_inliner_test.dart » ('j') | no next file with comments »