Fix ui-tests-app paths and add css-perf-test app

hamorphis · hamorphis · commit 525d0c43e351 · 2016-07-12T10:00:32.000+03:00
diff --git a/apps/app/css-perf-test/app.ts b/apps/app/css-perf-test/app.ts
@@ -0,0 +1,12 @@
+&#65279;import application = require("application");
+
+ global.time = function(): number {
+    if (global.android) {
+        return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
+    }
+    else {
+        return CACurrentMediaTime() * 1000;
+    }
+}
+
+application.start({ moduleName: "css-perf-test/root" });
diff --git a/apps/app/css-perf-test/main-page.css b/apps/app/css-perf-test/main-page.css
@@ -0,0 +1,29 @@
+&#65279;.title {
+    font-size: 20;
+    margin: 3;
+}
+
+.author {
+    font-size: 14;
+    horizontal-align: left;
+    vertical-align: bottom;
+    margin: 3;
+}
+
+.comments {
+    color: #10C2B0;
+    font-size: 14;
+    vertical-align: bottom;
+    margin: 3;
+}
+
+.thumbnail {
+    width: 72;
+    height: 72;
+    margin: 3;
+    vertical-align: top;
+}
+
+TabView {
+    background-color: white;
+}
diff --git a/apps/app/css-perf-test/main-page.ts b/apps/app/css-perf-test/main-page.ts
@@ -0,0 +1,7 @@
+&#65279;import {EventData as ObservableEventData} from "data/observable";
+
+export function navigatedTo(args: ObservableEventData) {
+    setTimeout(() => {
+        console.log(`Time: ${global.time() - global.startTime} ms`);
+    });
+}
diff --git a/apps/app/css-perf-test/main-page.xml b/apps/app/css-perf-test/main-page.xml
diff --git a/apps/app/css-perf-test/main-page2.css b/apps/app/css-perf-test/main-page2.css
@@ -0,0 +1,29 @@
+&#65279;.title {
+    font-size: 20;
+    margin: 3;
+}
+
+.author {
+    font-size: 14;
+    horizontal-align: left;
+    vertical-align: bottom;
+    margin: 3;
+}
+
+.comments {
+    color: #10C2B0;
+    font-size: 14;
+    vertical-align: bottom;
+    margin: 3;
+}
+
+.thumbnail {
+    width: 72;
+    height: 72;
+    margin: 3;
+    vertical-align: top;
+}
+
+TabView {
+    background-color: white;
+}
diff --git a/apps/app/css-perf-test/res/logo.png b/apps/app/css-perf-test/res/logo.png
diff --git a/apps/app/css-perf-test/root.ts b/apps/app/css-perf-test/root.ts
@@ -0,0 +1,7 @@
+&#65279;import {Page} from "ui/page";
+
+export function onTap(args: any) {
+    global.startTime = global.time();
+    let page = <Page>args.object.page;
+    page.frame.navigate("css-perf-test/main-page");
+}
diff --git a/apps/app/css-perf-test/root.xml b/apps/app/css-perf-test/root.xml
@@ -0,0 +1,3 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd">
+   <Button text="Start test" tap="onTap" />
+</Page>
diff --git a/apps/app/fonts/Pacifico.ttf b/apps/app/fonts/Pacifico.ttf
diff --git a/apps/app/fonts/Sofia.otf b/apps/app/fonts/Sofia.otf
diff --git a/apps/app/ui-tests-app/css/background.xml b/apps/app/ui-tests-app/css/background.xml
@@ -11,41 +11,41 @@
       <Button width="40" height="40" text="23" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 40; border-width: 20;"/>
 
       <!-- Repeat -->
-      <Button width="40" height="40" text="31" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png');"/>
-      <Button width="40" height="40" text="32" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:repeat-y;"/>
-      <Button width="40" height="40" text="33" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:repeat-x;"/>
+      <Button width="40" height="40" text="31" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png');"/>
+      <Button width="40" height="40" text="32" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat-y;"/>
+      <Button width="40" height="40" text="33" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat-x;"/>
 
       <!-- Position -->
-      <Button width="40" height="40" text="41" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat;"/>
-      <Button width="40" height="40" text="42" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: right top;"/>
-      <Button width="40" height="40" text="43" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center;"/>
-      <Button width="40" height="40" text="44" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: left bottom;"/>
-      <Button width="40" height="40" text="45" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 20% 80%;"/>
-      <Button width="40" height="40" text="46" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 20 80;"/>
-      <Button width="40" height="40" text="47" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -10 20;"/>
-      <Button width="40" height="40" text="48" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 10 -20;"/>
-      <Button width="40" height="40" text="49" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -10 -20;"/>
-      <Button width="40" height="40" text="50" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center;"/>
-      <Button width="40" height="40" text="51" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: left;"/>
-      <Button width="40" height="40" text="52" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: bottom;"/>
+      <Button width="40" height="40" text="41" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat;"/>
+      <Button width="40" height="40" text="42" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: right top;"/>
+      <Button width="40" height="40" text="43" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: center center;"/>
+      <Button width="40" height="40" text="44" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: left bottom;"/>
+      <Button width="40" height="40" text="45" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: 20% 80%;"/>
+      <Button width="40" height="40" text="46" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: 20 80;"/>
+      <Button width="40" height="40" text="47" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: -10 20;"/>
+      <Button width="40" height="40" text="48" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: 10 -20;"/>
+      <Button width="40" height="40" text="49" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: -10 -20;"/>
+      <Button width="40" height="40" text="50" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: center;"/>
+      <Button width="40" height="40" text="51" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: left;"/>
+      <Button width="40" height="40" text="52" tap="applyTap" tag="margin: 20; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: bottom;"/>
       
       <!-- Size -->
-      <Button width="40" height="40" text="61" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100px 100px;"/>
-      <Button width="40" height="40" text="62" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100% 100%;"/>
-      <Button width="40" height="40" text="63" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: cover;"/>
-      <Button width="40" height="40" text="64" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: contain;"/>
+      <Button width="40" height="40" text="61" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100px 100px;"/>
+      <Button width="40" height="40" text="62" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100% 100%;"/>
+      <Button width="40" height="40" text="63" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: cover;"/>
+      <Button width="40" height="40" text="64" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: contain;"/>
 
       <!-- All -->
-      <Button width="40" height="40" text="71" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-x; background-position: 20% 80%; background-size: 25% 50%; border-radius: 20; border-width: 4; border-color: lightpink;"/>
-      <Button width="40" height="40" text="72" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-y; background-position: 80 20; background-size: 50 25; border-radius: 20; border-width: 4; border-color: lightpink; opacity: 0.5;"/>
+      <Button width="40" height="40" text="71" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat-x; background-position: 20% 80%; background-size: 25% 50%; border-radius: 20; border-width: 4; border-color: lightpink;"/>
+      <Button width="40" height="40" text="72" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat-y; background-position: 80 20; background-size: 50 25; border-radius: 20; border-width: 4; border-color: lightpink; opacity: 0.5;"/>
       
       <!-- Antialiasing -->
-      <Button width="40" height="40" text="73" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-x; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
-      <Button width="40" height="40" text="74" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-y; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
-      <Button width="40" height="40" text="75" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
-      <Button width="40" height="40" text="76" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
-      <Button width="40" height="40" text="77" tap="applyTap" tag="margin: 20; background-color: #FF00FF00; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -15% -15%; background-size: 50% 50%; border-radius: 20; border-width: 10; border-color: #66FF0000;"/>
-      <Button width="40" height="40" text="78" tap="applyTap" tag="margin: 20; background-color: #FF00FF00; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -15% -15%; background-size: 50% 50%; border-width: 10; border-color: #66FF0000;"/>
+      <Button width="40" height="40" text="73" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat-x; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
+      <Button width="40" height="40" text="74" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat-y; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
+      <Button width="40" height="40" text="75" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:repeat; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
+      <Button width="40" height="40" text="76" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: -15% -15%; background-size: 50% 50%; border-radius: 9; border-width: 3; border-color: black;"/>
+      <Button width="40" height="40" text="77" tap="applyTap" tag="margin: 20; background-color: #FF00FF00; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: -15% -15%; background-size: 50% 50%; border-radius: 20; border-width: 10; border-color: #66FF0000;"/>
+      <Button width="40" height="40" text="78" tap="applyTap" tag="margin: 20; background-color: #FF00FF00; background-image: url('~/ui-tests-app/pages/test2.png'); background-repeat:no-repeat; background-position: -15% -15%; background-size: 50% 50%; border-width: 10; border-color: #66FF0000;"/>
     </WrapLayout>
   </GridLayout>
 </Page>
diff --git a/apps/app/ui-tests-app/css/styles.css b/apps/app/ui-tests-app/css/styles.css
@@ -2,4 +2,4 @@
     background-color: lightcoral;
 }
 
-@import url('~/css/import.css');
+@import url('~/ui-tests-app/css/import.css');
diff --git a/apps/app/ui-tests-app/image-view/rounded-buttons.xml b/apps/app/ui-tests-app/image-view/rounded-buttons.xml
@@ -1,6 +1,6 @@
 &#65279;<Page>
   <StackLayout>
     <Button text="ButtonCircle" style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:red;background-color:blue" />
-    <Button text="ButtonImage"  style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:blue;background-image:url('~/image-view/red.png')" />
+    <Button text="ButtonImage"  style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:blue;background-image:url('~/ui-tests-app/image-view/red.png')" />
   </StackLayout>
 </Page>
diff --git a/apps/app/ui-tests-app/image-view/rounded-images.css b/apps/app/ui-tests-app/image-view/rounded-images.css
@@ -57,5 +57,5 @@ style {
     border-width: 2;
     border-color: blue;
     border-radius: 100;
-    background-image: url('~/pages/red.png');
+    background-image: url('~/ui-tests-app/pages/red.png');
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<Page xmlns="http://schemas.nativescript.org/tns.xsd">`
	`2`	`+ <Button text="Start test" tap="onTap" />`
	`3`	`+</Page>`