Tests added

Author: vakrilov

Diff for: ng-sample/app/app.ts

@@ -112,12 +112,12 @@ const customPageFactoryProvider = {
     }
 };
 
-// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RendererTest));
+platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RendererTest));
 // platformNativeScriptDynamic(undefined, [customPageFactoryProvider]).bootstrapModule(makeExampleModule(RendererTest));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(TabViewTest));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(Benchmark));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTest));
-platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTemplateSelectorTest));
+// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTemplateSelectorTest));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTestAsync));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ImageTest));
 // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ModalTest));

Diff for: tests/app/snippets/navigation/page-outlet.ts

@@ -24,7 +24,6 @@ export class PageNavigationApp {
 
         this.done = new Promise<void>((resolve, reject) => {
             this.router.events.subscribe((e) => {
-                console.log("------>>>>>> PageRouter event: " + e.toString());
                 if (e instanceof NavigationStart) {
                     this.startEvent = e;
                 }

Diff for: tests/app/snippets/navigation/router-outlet.ts

@@ -34,7 +34,6 @@ export class NavigationApp {
 
         this.done = new Promise<void>((resolve, reject) => {
             this.router.events.subscribe((e) => {
-                console.log("------>>>>>> Router event: " + e.toString());
                 if (e instanceof NavigationStart) {
                     this.startEvent = e;
                 }

Diff for: tests/app/tests/list-view-tests.ts

@@ -1,55 +1,89 @@
-import {assert} from "./test-config";
-import {
-    ElementRef,
-    Component
-} from '@angular/core';
-import {TestApp} from "./test-app";
-import {device, platformNames} from "platform";
-const IS_IOS = (device.os === platformNames.ios);
+import { assert } from "./test-config";
+import { Component, Input, AfterViewInit } from '@angular/core';
+import { TestApp } from "./test-app";
+
+// import trace = require("trace");
+// trace.setCategories("ns-list-view, " + trace.categories.Navigation);
+// trace.enable();
 
 class DataItem {
     constructor(public id: number, public name: string) { }
 }
 
+const ITEMS = [
+    new DataItem(0, "data item 0"),
+    new DataItem(1, "data item 1"),
+    new DataItem(2, "data item 2"),
+];
+
+
+let testTemplates: { first: number, second: number };
+
 @Component({
     selector: 'list-view-setupItemView',
     template: `
-    <StackLayout>
-        <ListView height="200" [items]="myItems" (setupItemView)="onSetupItemView($event)">
-            <template let-item="item" let-i="index" let-odd="odd" let-even="even">
-                <StackLayout [class.odd]="odd" [class.even]="even">
-                    <Label [text]='"index: " + i'></Label>
-                    <Label [text]='"[" + item.id +"] " + item.name'></Label>
-                </StackLayout>
+    <GridLayout>
+        <ListView [items]="myItems" (setupItemView)="onSetupItemView($event)">
+            <template let-item="item">
+                <Label [text]='"[" + item.id +"] " + item.name'></Label>
             </template>
         </ListView>
-    </StackLayout>
+    </GridLayout>
     `
 })
 export class TestListViewComponent {
-    public myItems: Array<DataItem>;
-    public counter: number;
+    public myItems: Array<DataItem> = ITEMS;
+    public counter: number = 0;
+    onSetupItemView(args) { this.counter++; }
+}
 
-    constructor(public elementRef: ElementRef) {
-        this.counter = 0;
-        this.myItems = [];
-        for (var i = 0; i < 2; i++) {
-            this.myItems.push(new DataItem(i, "data item " + i));
+@Component({
+    selector: 'item-component',
+    template: `<Label text="template"></Label>`
+})
+export class ItemTemplateComponent {
+    @Input() set templateName(value: any) {
+        if (value === "first") {
+            testTemplates.first = testTemplates.first + 1;
+        } else if (value === "second") {
+            testTemplates.second = testTemplates.second + 1;
+        } else {
+            throw new Error("Unexpected templateName: " + value);
         }
     }
+}
 
-    onSetupItemView(args) {
-        this.counter++;
+@Component({
+    selector: 'list-with-template-selector',
+    template: `
+    <GridLayout>
+        <ListView [items]="myItems" [itemTemplateSelector]="templateSelector">
+            <template nsTemplateKey="first">
+                <item-component templateName="first"></item-component>
+            </template>
+            
+            <template nsTemplateKey="second" let-item="item">
+                <item-component templateName="second"></item-component>
+            </template>
+        </ListView>
+    </GridLayout>
+  `
+})
+export class TestListViewSelectorComponent {
+    public myItems: Array<DataItem> = ITEMS;
+    public templateSelector = (item: DataItem, index: number, items: any) => {
+        return (item.id % 2 === 0) ? "first" : "second";
     }
+    constructor() { testTemplates = { first: 0, second: 0 }; }
 }
 
 describe('ListView-tests', () => {
     let testApp: TestApp = null;
 
     before(() => {
-        return TestApp.create([], [TestListViewComponent]).then((app) => {
+        return TestApp.create([], [TestListViewComponent, TestListViewSelectorComponent, ItemTemplateComponent]).then((app) => {
             testApp = app;
-        })
+        });
     });
 
     after(() => {
@@ -64,11 +98,21 @@ describe('ListView-tests', () => {
         return testApp.loadComponent(TestListViewComponent).then((componentRef) => {
             const component = componentRef.instance;
             setTimeout(() => {
-                console.log("component: " + component);
-                assert.equal(component.counter, 2);
+                assert.equal(component.counter, 3);
+                done();
+            }, 1000);
+        })
+            .catch(done);
+    });
+
+
+    it('itemTemplateSelector selects templates', (done) => {
+        return testApp.loadComponent(TestListViewSelectorComponent).then((componentRef) => {
+            setTimeout(() => {
+                assert.deepEqual(testTemplates,  { first: 2, second: 1 });
                 done();
             }, 1000);
         })
-        .catch(done);
+            .catch(done);
     });
 });

Diff for: tests/app/tests/test-app.ts

@@ -4,7 +4,6 @@ import {
     Type, Component, ComponentRef,
     ComponentFactoryResolver, ApplicationRef, Renderer,
     ViewContainerRef, NgZone, NgModule,
-    NgModuleRef,
 } from "@angular/core";
 
 import {GridLayout} from "ui/layouts/grid-layout";
@@ -42,7 +41,7 @@ export class TestApp {
 
     public disposeComponents() {
         while (this._pendingDispose.length > 0) {
-            const componentRef = this._pendingDispose.pop()
+            const componentRef = this._pendingDispose.pop();
             componentRef.destroy();
         }
     }
@@ -132,7 +131,7 @@ export function destroyTestApp(app: any) {
         throw new Error("Unable to cleanup app: " + app);
     }
 
-    var entry = runningApps.get(app);
+    const entry = runningApps.get(app);
     entry.container.removeChild(entry.appRoot);
     //TODO: App disposal not doing anything useful anymore. Get rid of it?
     //entry.appRef.dispose();

Diff for: tests/package.json

@@ -26,7 +26,7 @@
     ],
     "homepage": "http://nativescript.org",
     "dependencies": {
-        "nativescript-unit-test-runner": "^0.3.3",
+        "nativescript-unit-test-runner": "^0.3.4",
         "tns-core-modules": "2.4.0",
         "nativescript-angular": "file:../nativescript-angular",
         "@angular/core": "~2.2.1",