From a67e46fc98c2c0e93265eb54255e6d00599f8103 Mon Sep 17 00:00:00 2001
From: Nathanael Anderson <nathan@master-technology.com>
Date: Wed, 26 Aug 2015 03:19:02 -0500
Subject: [PATCH] Tests to test both a Declarative UI w/ CSS and a createPage
 w/ CSS file to verify CSS file is loaded

---
 apps/tests/ui/page/page-tests-common.ts       | 31 ++++++++++++++++++-
 .../ui/page/test-page-declarative-css.css     |  3 ++
 .../ui/page/test-page-declarative-css.xml     |  3 ++
 apps/tests/ui/page/test-page-module-css.css   |  3 ++
 apps/tests/ui/page/test-page-module-css.ts    | 19 ++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 apps/tests/ui/page/test-page-declarative-css.css
 create mode 100644 apps/tests/ui/page/test-page-declarative-css.xml
 create mode 100644 apps/tests/ui/page/test-page-module-css.css
 create mode 100644 apps/tests/ui/page/test-page-module-css.ts

diff --git a/apps/tests/ui/page/page-tests-common.ts b/apps/tests/ui/page/page-tests-common.ts
index bdc8ee736..30ff43f16 100644
--- a/apps/tests/ui/page/page-tests-common.ts
+++ b/apps/tests/ui/page/page-tests-common.ts
@@ -247,7 +247,7 @@ export function test_LoadPageFromModule() {
     try {
         var topFrame = FrameModule.topmost();
         TKUnit.assert(topFrame.currentPage.content instanceof LabelModule.Label, "Content of the test page should be a Label created within test-page-module.");
-        var testLabel = <LabelModule.Label>topFrame.currentPage.content
+        var testLabel = <LabelModule.Label>topFrame.currentPage.content;
         TKUnit.assert(testLabel.text === "Label created within a page module.");
     }
     finally {
@@ -255,6 +255,35 @@ export function test_LoadPageFromModule() {
     }
 }
 
+export function test_LoadPageFromDeclarativeWithCSS() {
+    helper.navigateToModule("ui/page/test-page-declarative-css");
+    try {
+        var topFrame = FrameModule.topmost();
+        TKUnit.assert(topFrame.currentPage.content instanceof LabelModule.Label, "Content of the test page should be a Label created within test-page-module-css.");
+        var testLabel = <LabelModule.Label>topFrame.currentPage.content;
+        TKUnit.assert(testLabel.text === "Label created within a page declarative file with css.");
+        TKUnit.assert(testLabel.style.backgroundColor.hex === "#ff00ff00", "Expected: #ff00ff00, Actual: " + testLabel.style.backgroundColor.hex);
+    }
+    finally {
+        helper.goBack();
+    }
+
+}
+
+export function test_LoadPageFromModuleWithCSS() {
+    helper.navigateToModule("ui/page/test-page-module-css");
+    try {
+        var topFrame = FrameModule.topmost();
+        TKUnit.assert(topFrame.currentPage.content instanceof LabelModule.Label, "Content of the test page should be a Label created within test-page-module-css.");
+        var testLabel = <LabelModule.Label>topFrame.currentPage.content;
+        TKUnit.assert(testLabel.text === "Label created within a page module css.");
+        TKUnit.assert(testLabel.style.backgroundColor.hex === "#ff00ff00", "Expected: #ff00ff00, Actual: " + testLabel.style.backgroundColor.hex);
+    }
+    finally {
+        helper.goBack();
+    }
+}
+
 export function test_NavigateToPageCreatedWithNavigationEntry() {
     var expectedText = "Label created with a NavigationEntry";
     var testPage: PageModule.Page;
diff --git a/apps/tests/ui/page/test-page-declarative-css.css b/apps/tests/ui/page/test-page-declarative-css.css
new file mode 100644
index 000000000..1cebd4dd0
--- /dev/null
+++ b/apps/tests/ui/page/test-page-declarative-css.css
@@ -0,0 +1,3 @@
+Label {
+    background-color: #ff00ff00;
+}
\ No newline at end of file
diff --git a/apps/tests/ui/page/test-page-declarative-css.xml b/apps/tests/ui/page/test-page-declarative-css.xml
new file mode 100644
index 000000000..af7ce14a3
--- /dev/null
+++ b/apps/tests/ui/page/test-page-declarative-css.xml
@@ -0,0 +1,3 @@
+<Page>
+    <Label text="Label created within a page declarative file with css."/>
+</Page>
\ No newline at end of file
diff --git a/apps/tests/ui/page/test-page-module-css.css b/apps/tests/ui/page/test-page-module-css.css
new file mode 100644
index 000000000..1cebd4dd0
--- /dev/null
+++ b/apps/tests/ui/page/test-page-module-css.css
@@ -0,0 +1,3 @@
+Label {
+    background-color: #ff00ff00;
+}
\ No newline at end of file
diff --git a/apps/tests/ui/page/test-page-module-css.ts b/apps/tests/ui/page/test-page-module-css.ts
new file mode 100644
index 000000000..6bfcf7c13
--- /dev/null
+++ b/apps/tests/ui/page/test-page-module-css.ts
@@ -0,0 +1,19 @@
+import PageModule = require("ui/page");
+import LabelModule = require("ui/label");
+
+export class TestPageModule extends PageModule.Page {
+    constructor() {
+        super();
+
+        var label = new LabelModule.Label();
+        label.text = "Label created within a page module css.";
+
+        this.content = label;
+    }
+}
+
+export function createPage() {
+    return new TestPageModule();
+}
+
+//export var Page = new TestPageModule();
\ No newline at end of file