Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

Commit

Permalink
doc: Move tests to new test-structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikeMitterer
MikeMitterer committed Dec 4, 2015
1 parent 096acd4 commit 264ca1d
Show file tree
Hide file tree
Showing 47 changed files with 1,308 additions and 784 deletions.
9 changes: 9 additions & 0 deletions .analysis_options
View file
@@ -0,0 +1,9 @@
analyzer:
# strong-mode: true

exclude:
- lib/_templates/**
- tool/demobase/**
- tool/jsbase/**
- tool/portbase/**
- tool/templates/**
2 changes: 1 addition & 1 deletion lib/src/application/components/MaterialContent.dart
View file
Expand Up @@ -46,7 +46,7 @@ class MaterialContent extends MdlComponent {
final DomRenderer _renderer; final DomRenderer _renderer;


MaterialContent.fromElement(final dom.HtmlElement element,final di.Injector injector) MaterialContent.fromElement(final dom.HtmlElement element,final di.Injector injector)
: super(element,injector), _renderer = injector.get(DomRenderer) { : _renderer = injector.get(DomRenderer), super(element,injector) {
_init(); _init();
} }


Expand Down
2 changes: 1 addition & 1 deletion lib/src/application/components/MaterialInclude.dart
View file
Expand Up @@ -58,7 +58,7 @@ class MaterialInclude extends MdlComponent {
Stream<MaterialContentEvent> onLoadEnd; Stream<MaterialContentEvent> onLoadEnd;


MaterialInclude.fromElement(final dom.HtmlElement element,final di.Injector injector) MaterialInclude.fromElement(final dom.HtmlElement element,final di.Injector injector)
: super(element,injector), _renderer = injector.get(DomRenderer) { : _renderer = injector.get(DomRenderer), super(element,injector) {


onLoadEnd = _controller.stream; onLoadEnd = _controller.stream;
_init(); _init();
Expand Down
2 changes: 1 addition & 1 deletion lib/src/components/MaterialAccordion.dart
View file
Expand Up @@ -131,7 +131,7 @@ class MaterialAccordion extends MdlComponent {
final String id = "accordion-${label.hashCode}"; final String id = "accordion-${label.hashCode}";
(label as dom.LabelElement).htmlFor = id; (label as dom.LabelElement).htmlFor = id;


final dom.InputElement inputElement = new dom.CheckboxInputElement(); final dom.CheckboxInputElement inputElement = new dom.CheckboxInputElement();
if(isRadio) { if(isRadio) {
eventStreams.add( eventStreams.add(
inputElement.onClick.listen((final dom.Event event) { inputElement.onClick.listen((final dom.Event event) {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/components/MaterialButton.dart
View file
Expand Up @@ -76,10 +76,10 @@ class MaterialButton extends MdlComponent {
_logger.fine("MaterialButton - init"); _logger.fine("MaterialButton - init");


if(element.classes.contains(_cssClasses.RIPPLE_EFFECT)) { if(element.classes.contains(_cssClasses.RIPPLE_EFFECT)) {
final dom.SpanElement rippleContainer = new dom.Element.span(); final dom.SpanElement rippleContainer = new dom.SpanElement();
rippleContainer.classes.add(_cssClasses.RIPPLE_CONTAINER); rippleContainer.classes.add(_cssClasses.RIPPLE_CONTAINER);


final dom.SpanElement rippleElement = new dom.Element.span(); final dom.SpanElement rippleElement = new dom.SpanElement();
rippleElement.classes.add(_cssClasses.RIPPLE); rippleElement.classes.add(_cssClasses.RIPPLE);
rippleContainer.append(rippleElement); rippleContainer.append(rippleElement);


Expand Down
3 changes: 2 additions & 1 deletion lib/src/core/MdlComponentHandler.dart
View file
Expand Up @@ -22,7 +22,8 @@ part of mdlcore;
/// Thrown if you try to register more than one widget per element /// Thrown if you try to register more than one widget per element
/// Multiple components per element are allowed but not multiple widgets! /// Multiple components per element are allowed but not multiple widgets!
class MultipleWidgetException implements Exception { class MultipleWidgetException implements Exception {
factory MultipleWidgetException([var message]) => new Exception(message); final message;
MultipleWidgetException([this.message]);
} }


/// Property for the Components JsObject to save/register the component /// Property for the Components JsObject to save/register the component
Expand Down
3 changes: 2 additions & 1 deletion lib/src/core/utils.dart
View file
Expand Up @@ -20,7 +20,8 @@
part of mdlcore; part of mdlcore;


class WrongComponentTypeException implements Exception { class WrongComponentTypeException implements Exception {
factory WrongComponentTypeException([var message]) => new Exception(message); final message;
WrongComponentTypeException([this.message]);
} }


/** /**
Expand Down
2 changes: 1 addition & 1 deletion lib/src/directive/components/MaterialModel.dart
View file
Expand Up @@ -45,7 +45,7 @@ class MaterialModel extends MdlComponent implements RefreshableComponent {
final ModelObserverFactory _observerFactory; final ModelObserverFactory _observerFactory;


MaterialModel.fromElement(final dom.HtmlElement element,final di.Injector injector) MaterialModel.fromElement(final dom.HtmlElement element,final di.Injector injector)
: super(element,injector), _observerFactory = injector.get(ModelObserverFactory) { : _observerFactory = injector.get(ModelObserverFactory), super(element,injector) {
} }


@override @override
Expand Down
4 changes: 2 additions & 2 deletions lib/src/directive/components/MaterialObserve.dart
View file
Expand Up @@ -60,8 +60,8 @@ class MaterialObserve extends MdlComponent implements ScopeAware {
Scope scope; Scope scope;


MaterialObserve.fromElement(final dom.HtmlElement element,final di.Injector injector) MaterialObserve.fromElement(final dom.HtmlElement element,final di.Injector injector)
: super(element,injector), : _renderer = injector.get(DomRenderer), _eventCompiler = injector.get(EventCompiler),
_renderer = injector.get(DomRenderer), _eventCompiler = injector.get(EventCompiler) { super(element,injector) {
} }


static MaterialObserve widget(final dom.HtmlElement element) => mdlComponent(element,MaterialObserve) as MaterialObserve; static MaterialObserve widget(final dom.HtmlElement element) => mdlComponent(element,MaterialObserve) as MaterialObserve;
Expand Down
184 changes: 92 additions & 92 deletions lib/src/grinder/src/SampleGenerator.dart
View file
Expand Up @@ -337,96 +337,96 @@ class SampleGenerator {
}); });
} }


void _addDartMainToIndexHTML(final File indexFile) { // void _addDartMainToIndexHTML(final File indexFile) {
Validate.notNull(indexFile); // Validate.notNull(indexFile);
Validate.isTrue(indexFile.existsSync()); // Validate.isTrue(indexFile.existsSync());

//
final List<String> lines = indexFile.readAsLinesSync(); // final List<String> lines = indexFile.readAsLinesSync();
final StringBuffer buffer = new StringBuffer(); // final StringBuffer buffer = new StringBuffer();

//
bool commentLine = false; // bool commentLine = false;
lines.forEach((final String line) { // lines.forEach((final String line) {
if(line.contains("<script")) { // if(line.contains("<script")) {
commentLine = true; // commentLine = true;
} // }

//
if(commentLine || (line.contains("<script") && line.contains("</script"))) { // if(commentLine || (line.contains("<script") && line.contains("</script"))) {
final String newline = " <!-- ${line.trim()} -->"; // final String newline = " <!-- ${line.trim()} -->";
buffer.writeln(newline); // buffer.writeln(newline);
} // }

//

//
else if(line.contains("</body>")) { // else if(line.contains("</body>")) {
buffer.writeln(' <!-- start Autogenerated with gensamples.dart -->'); // buffer.writeln(' <!-- start Autogenerated with gensamples.dart -->');
buffer.writeln(' <script type="application/dart" src="main.dart"></script>'); // buffer.writeln(' <script type="application/dart" src="main.dart"></script>');
buffer.writeln(' <script type="text/javascript" src="packages/browser/dart.js"></script>'); // buffer.writeln(' <script type="text/javascript" src="packages/browser/dart.js"></script>');
buffer.writeln(' <!-- end Autogenerated with gensamples.dart -->'); // buffer.writeln(' <!-- end Autogenerated with gensamples.dart -->');
buffer.writeln(line); // buffer.writeln(line);
} // }
else { // else {
buffer.writeln(line); // buffer.writeln(line);
} // }

//
if(line.contains("</script")) { // if(line.contains("</script")) {
commentLine = false; // commentLine = false;
} // }

//
}); // });

//
final String style = """\t<style> // final String style = """\t<style>
/* Autogenerated with gensamples.dart */ // /* Autogenerated with gensamples.dart */
div.loading { display: none; } // div.loading { display: none; }
body.mdl-upgrading > * { display: none; } // body.mdl-upgrading > * { display: none; }
body.mdl-upgrading div.loading { display: block; }\n\t</style>"""; // body.mdl-upgrading div.loading { display: block; }\n\t</style>""";

//
//final String newBody = '\t<body class="mdl-upgrading"> <div class="loading">Loading...</div>'; // //final String newBody = '\t<body class="mdl-upgrading"> <div class="loading">Loading...</div>';

//
String contents = buffer.toString(); // String contents = buffer.toString();
contents = contents.replaceFirst(new RegExp(r".*</head>"),"\n$style\n </head>"); // contents = contents.replaceFirst(new RegExp(r".*</head>"),"\n$style\n </head>");

//
//contents = contents.replaceFirst(new RegExp(r".*<body>"),newBody); // //contents = contents.replaceFirst(new RegExp(r".*<body>"),newBody);
contents = contents.replaceAllMapped(new RegExp(r'<body class="([^"]*)"[^>]*>'), // contents = contents.replaceAllMapped(new RegExp(r'<body class="([^"]*)"[^>]*>'),
(final Match m) => '<body class="${m[1]} mdl-upgrading mdl-typography"> <div class="loading">Loading...</div>'); // (final Match m) => '<body class="${m[1]} mdl-upgrading mdl-typography"> <div class="loading">Loading...</div>');

//
indexFile.writeAsStringSync(contents); // indexFile.writeAsStringSync(contents);
} // }


void _changeImportStatementInSassFile(final File scssFile,final String sampleName) { // void _changeImportStatementInSassFile(final File scssFile,final String sampleName) {
Validate.notNull(scssFile); // Validate.notNull(scssFile);
Validate.isTrue(scssFile.existsSync()); // Validate.isTrue(scssFile.existsSync());

//
final List<String> lines = scssFile.readAsLinesSync(); // final List<String> lines = scssFile.readAsLinesSync();
final StringBuffer contents = new StringBuffer(); // final StringBuffer contents = new StringBuffer();

//
lines.forEach((final String line) { // lines.forEach((final String line) {
if(line.contains('@import "../mixins"')) { // if(line.contains('@import "../mixins"')) {
final String newLine = '@import "packages/mdl/assets/styles/mixins/mixins";'; // final String newLine = '@import "packages/mdl/assets/styles/mixins/mixins";';
contents.writeln(newLine); // contents.writeln(newLine);

//
} else if(line.contains(new RegExp("@import [\"']{1}\\\.{2}"))) { // } else if(line.contains(new RegExp("@import [\"']{1}\\\.{2}"))) {
final String newline = line.replaceAllMapped(new RegExp("@import ([\"']){1}\\\.{2}/"), // final String newline = line.replaceAllMapped(new RegExp("@import ([\"']){1}\\\.{2}/"),
(final Match m) => "@import ${m[1]}packages/mdl/assets/styles/"); // (final Match m) => "@import ${m[1]}packages/mdl/assets/styles/");

//
contents.writeln(newline); // contents.writeln(newline);

//
} else if(line.contains(new RegExp("@import [\"']{1}"))) { // } else if(line.contains(new RegExp("@import [\"']{1}"))) {
final String newline = line.replaceAllMapped(new RegExp("@import ([\"']){1}"), // final String newline = line.replaceAllMapped(new RegExp("@import ([\"']){1}"),
(final Match m) => "@import ${m[1]}packages/mdl/assets/styles/$sampleName/"); // (final Match m) => "@import ${m[1]}packages/mdl/assets/styles/$sampleName/");

//
contents.writeln(newline); // contents.writeln(newline);
} // }
else { // else {
contents.writeln(line); // contents.writeln(line);
} // }
}); // });

//
scssFile.writeAsStringSync(contents.toString()); // scssFile.writeAsStringSync(contents.toString());
} // }


void _addImportStatementInSassFile(final File scssFile) { // void _addImportStatementInSassFile(final File scssFile) {
String content = scssFile.readAsStringSync(); // String content = scssFile.readAsStringSync();

//
content = '@import "packages/mdl/assets/styles/material-design-lite";\n\n' + content; // content = '@import "packages/mdl/assets/styles/material-design-lite";\n\n' + content;
scssFile.writeAsStringSync(content); // scssFile.writeAsStringSync(content);
} // }
} }
28 changes: 14 additions & 14 deletions lib/src/grinder/src/Styleguide.dart
View file
Expand Up @@ -22,7 +22,7 @@ part of mdl.grinder;
class Styleguide { class Styleguide {


void generate(final Sample sample) { void generate(final Sample sample) {
final Sample sampleStyleguide = samples.firstWhere((final Sample sample) => sample.type == Type.Styleguide); // final Sample sampleStyleguide = samples.firstWhere((final Sample sample) => sample.type == Type.Styleguide);


_copyDemoCssToStyleguide(sample,samplesToExclude: [ "layout1" ]); _copyDemoCssToStyleguide(sample,samplesToExclude: [ "layout1" ]);
_copySampleViewToStyleguide(sample,samplesToExclude: [ "layout1" ]); _copySampleViewToStyleguide(sample,samplesToExclude: [ "layout1" ]);
Expand Down Expand Up @@ -104,19 +104,19 @@ class Styleguide {
multiLine: true, caseSensitive: false),""); multiLine: true, caseSensitive: false),"");


// Mustache-Block (not called - just to remember) // Mustache-Block (not called - just to remember)
void _removeMustacheBlock() { // void _removeMustacheBlock() {
content = content.replaceAll( // content = content.replaceAll(
new RegExp( // new RegExp(
// switches for mustache-delimiter // // switches for mustache-delimiter
r"(?:(\{\{= \| \| =\}\})|(\|= \{\{ \}\} =\|))", // r"(?:(\{\{= \| \| =\}\})|(\|= \{\{ \}\} =\|))",
multiLine: true, caseSensitive: false),""); // multiLine: true, caseSensitive: false),"");

//
content = content.replaceAll( // content = content.replaceAll(
new RegExp( // new RegExp(
// Mustache comment // // Mustache comment
r"\{\{\![^}]*\}\}", // r"\{\{\![^}]*\}\}",
multiLine: true, caseSensitive: false),""); // multiLine: true, caseSensitive: false),"");
} // }


//content = content.replaceAll(new RegExp(r"^",caseSensitive: false, multiLine: true)," "); //content = content.replaceAll(new RegExp(r"^",caseSensitive: false, multiLine: true)," ");


Expand Down
2 changes: 1 addition & 1 deletion lib/src/template/components/MaterialMustache.dart
View file
Expand Up @@ -46,7 +46,7 @@ class MaterialMustache extends MdlComponent {
String _template = ""; String _template = "";


MaterialMustache.fromElement(final dom.HtmlElement element,final di.Injector injector) MaterialMustache.fromElement(final dom.HtmlElement element,final di.Injector injector)
: super(element,injector), _renderer = injector.get(DomRenderer) { : _renderer = injector.get(DomRenderer), super(element,injector) {
_init(); _init();
} }


Expand Down
4 changes: 2 additions & 2 deletions lib/src/template/components/MaterialRepeat.dart
View file
Expand Up @@ -102,8 +102,8 @@ class MaterialRepeat extends MdlTemplateComponent {
final List _items = new List(); final List _items = new List();


MaterialRepeat.fromElement(final dom.HtmlElement element,final di.Injector injector) MaterialRepeat.fromElement(final dom.HtmlElement element,final di.Injector injector)
: super(element,injector), : _repeatRenderer = injector.get(DomRenderer), _eventCompiler = injector.get(EventCompiler),
_repeatRenderer = injector.get(DomRenderer), _eventCompiler = injector.get(EventCompiler) { super(element,injector) {


_init(); _init();
} }
Expand Down

0 comments on commit 264ca1d

Please sign in to comment.