Skip to content

Commit 53a76d1

Browse files
vakrilovSvetoslavTsenov
vakrilov
authored and
SvetoslavTsenov
committed
refactor: tests app changes
1 parent 2b42f0a commit 53a76d1

File tree

4 files changed

+118
-114
lines changed

4 files changed

+118
-114
lines changed

‎e2e/renderer/app/app.module.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import {
99
import { AppComponent } from "./app.component";
1010
import { ItemsService } from "./items.service";
1111

12-
import { rendererTraceCategory, viewUtilCategory } from "nativescript-angular/trace";
13-
import { setCategories, enable } from "trace";
14-
setCategories(rendererTraceCategory + "," + viewUtilCategory);
12+
import { rendererTraceCategory, viewUtilCategory, bootstrapCategory } from "nativescript-angular/trace";
13+
import { addCategories, enable } from "trace";
14+
addCategories(bootstrapCategory);
15+
// addCategories(rendererTraceCategory);
16+
// addCategories(viewUtilCategory);
1517
enable();
1618

1719
@NgModule({

‎tests/app/main.ts

Lines changed: 52 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
66
import { platformNativeScriptDynamic } from "nativescript-angular/platform";
7-
import { NativeScriptRouterModule, NSModuleFactoryLoader } from "nativescript-angular/router";
7+
import { NativeScriptRouterModule } from "nativescript-angular/router";
88
import { NativeScriptFormsModule } from "nativescript-angular/forms";
99

1010
import { AppComponent } from "./app.component";
@@ -33,17 +33,38 @@ import { rendererTraceCategory, routerTraceCategory } from "nativescript-angular
3333

3434
import { BehaviorSubject } from "rxjs/BehaviorSubject";
3535

36-
import trace = require("trace");
37-
trace.setCategories(rendererTraceCategory + "," + routerTraceCategory);
36+
import { GridLayout, ItemSpec } from "tns-core-modules/ui/layouts/grid-layout/grid-layout";
37+
38+
import { enable, addCategories, categories } from "trace";
39+
import { Color } from "tns-core-modules/color/color";
40+
41+
addCategories(rendererTraceCategory);
42+
// addCategories(routerTraceCategory);
43+
addCategories(categories.ViewHierarchy);
44+
3845
// trace.setCategories(routerTraceCategory);
39-
// trace.enable();
46+
enable();
4047

4148
// nativeScriptBootstrap(GestureComponent);
4249
// nativeScriptBootstrap(LayoutsComponent);
4350
// nativeScriptBootstrap(IconFontComponent);
4451
const platform = platformNativeScriptDynamic({ bootInExistingPage: true });
45-
const root = new StackLayout();
46-
const rootViewProvider = { provide: APP_ROOT_VIEW, useValue: root };
52+
const root = new GridLayout();
53+
54+
let rootViewsCount = 0;
55+
let colors = ["lightgreen", "lightblue", "lightpink"];
56+
function createRootProvider() {
57+
root.addRow(new ItemSpec(1, "star"));
58+
59+
const appRootView = new StackLayout();
60+
GridLayout.setRow(appRootView, rootViewsCount);
61+
root.addChild(appRootView);
62+
appRootView.backgroundColor = new Color(colors[rootViewsCount % colors.length]);
63+
64+
rootViewsCount++;
65+
return { provide: APP_ROOT_VIEW, useValue: appRootView };
66+
}
67+
4768
const singlePageHooksLog = new BehaviorSubject([]);
4869
const singlePageHooksLogProvider = { provide: HOOKS_LOG, useValue: singlePageHooksLog };
4970
const multiPageHooksLog = new BehaviorSubject([]);
@@ -52,108 +73,58 @@ const lazyLoadHooksLog = new BehaviorSubject([]);
5273
export const lazyLoadHooksLogProvider = { provide: HOOKS_LOG, useValue: lazyLoadHooksLog };
5374

5475
@NgModule({
55-
bootstrap: [
56-
SinglePageMain
57-
],
58-
declarations: [
59-
SinglePageMain,
60-
FirstComponent,
61-
SecondComponent,
62-
],
63-
entryComponents: [
64-
SinglePageMain,
65-
FirstComponent,
66-
SecondComponent,
67-
],
76+
bootstrap: [SinglePageMain],
77+
declarations: [SinglePageMain, FirstComponent, SecondComponent],
78+
entryComponents: [SinglePageMain, FirstComponent, SecondComponent],
6879
imports: [
6980
NativeScriptModule,
7081
NativeScriptFormsModule,
7182
NativeScriptRouterModule,
7283
NativeScriptRouterModule.forRoot(singlePageRoutes),
7384
],
74-
exports: [
75-
NativeScriptModule,
76-
NativeScriptFormsModule,
77-
NativeScriptRouterModule,
78-
],
79-
providers: [
80-
rootViewProvider,
81-
singlePageHooksLogProvider,
82-
]
85+
exports: [NativeScriptModule, NativeScriptFormsModule, NativeScriptRouterModule],
86+
providers: [createRootProvider(), singlePageHooksLogProvider],
8387
})
84-
class SinglePageModule { }
88+
class SinglePageModule {}
8589

8690
@NgModule({
87-
bootstrap: [
88-
MultiPageMain
89-
],
90-
declarations: [
91-
MultiPageMain,
92-
FirstComponent,
93-
SecondComponent,
94-
],
95-
entryComponents: [
96-
MultiPageMain,
97-
FirstComponent,
98-
SecondComponent,
99-
],
91+
bootstrap: [MultiPageMain],
92+
declarations: [MultiPageMain, FirstComponent, SecondComponent],
93+
entryComponents: [MultiPageMain, FirstComponent, SecondComponent],
10094
imports: [
10195
NativeScriptModule,
10296
NativeScriptFormsModule,
10397
NativeScriptRouterModule,
10498
NativeScriptRouterModule.forRoot(multiPageRoutes),
10599
],
106-
exports: [
107-
NativeScriptModule,
108-
NativeScriptFormsModule,
109-
NativeScriptRouterModule,
110-
],
111-
providers: [
112-
rootViewProvider,
113-
multiPageHooksLogProvider,
114-
]
100+
exports: [NativeScriptModule, NativeScriptFormsModule, NativeScriptRouterModule],
101+
providers: [createRootProvider(), multiPageHooksLogProvider],
115102
})
116-
class MultiPageModule { }
103+
class MultiPageModule {}
117104

118105
@NgModule({
119-
bootstrap: [
120-
LazyLoadMain
121-
],
122-
declarations: [
123-
LazyLoadMain,
124-
FirstComponent,
125-
],
126-
entryComponents: [
127-
LazyLoadMain,
128-
],
106+
bootstrap: [LazyLoadMain],
107+
declarations: [LazyLoadMain, FirstComponent],
108+
entryComponents: [LazyLoadMain],
129109
imports: [
130110
NativeScriptModule,
131111
NativeScriptFormsModule,
132112
NativeScriptRouterModule,
133113
NativeScriptRouterModule.forRoot(lazyLoadRoutes),
134114
],
135-
exports: [
136-
NativeScriptModule,
137-
NativeScriptFormsModule,
138-
NativeScriptRouterModule,
139-
],
115+
exports: [NativeScriptModule, NativeScriptFormsModule, NativeScriptRouterModule],
140116
providers: [
141-
rootViewProvider,
117+
createRootProvider(),
142118
lazyLoadHooksLogProvider,
143-
{ provide: NgModuleFactoryLoader, useClass: NSModuleFactoryLoader },
144-
]
119+
],
145120
})
146-
class LazyLoadModule { }
121+
class LazyLoadModule {}
147122

148-
application.start({
123+
application.run({
149124
create: (): Page => {
150-
const page = new Page();
151-
page.content = root;
152-
153-
let onLoadedHandler = function (args) {
154-
page.off("loaded", onLoadedHandler);
125+
let onLoadedHandler = function(args) {
126+
root.off("loaded", onLoadedHandler);
155127
// profiling.stop('application-start');
156-
console.log("Page loaded");
157128

158129
// profiling.start('ng-bootstrap');
159130
console.log("BOOTSTRAPPING TEST APPS...");
@@ -163,8 +134,8 @@ application.start({
163134
platform.bootstrapModule(LazyLoadModule);
164135
};
165136

166-
page.on("loaded", onLoadedHandler);
137+
root.on("loaded", onLoadedHandler);
167138

168-
return page;
169-
}
139+
return <any>root;
140+
},
170141
});

‎tests/app/single-page-main.component.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,13 @@ import {SecondComponent} from "./second.component";
77
@Component({
88
selector: "single-page-main",
99
template: `
10-
<ListView [items]="['lqlq', 'shalqlq']" class="list-group">
11-
<ng-template let-item="item" let-odd="odd" let-even="even">
12-
<StackLayout>
13-
<Label [text]="item" class="list-group-item"></Label>
14-
</StackLayout>
15-
</ng-template>
16-
</ListView>
17-
18-
<Label text="Single-page router"></Label>
19-
<router-outlet></router-outlet>
10+
<StackLayout>
11+
<Label text="Single-page router"></Label>
12+
<router-outlet></router-outlet>
13+
</StackLayout>
2014
`
21-
2215
})
23-
export class SinglePageMain {
16+
export class SinglePageMain {
2417
constructor(
2518
public elementRef: ElementRef,
2619
public router: Router,

0 commit comments

Comments
 (0)