Skip to content

Commit d5af4c4

Browse files
ErjanGavaljiErjanGavalji
committed
Fix tests app paths
1 parent cb25cfc commit d5af4c4

File tree

20 files changed

+33
-33
lines changed

20 files changed

+33
-33
lines changed

‎apps/tests/app/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import application = require("application");
2-
application.mainModule = "app/app/mainPage";
2+
application.mainModule = "app/mainPage";
33
application.start();

‎apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ function testTemplate(candidates: Array<string>, context: resolver.PlatformConte
212212
TKUnit.assertEqual(result, expected, "File path");
213213
}
214214

215-
var testFilePath = fs.path.join(fs.knownFolders.currentApp().path, "app/tests/file-name-resolver-tests/files/test");
215+
var testFilePath = fs.path.join(fs.knownFolders.currentApp().path, "tests/file-name-resolver-tests/files/test");
216216

217217
export function test_file_resolver_with_andorid_phone_portratit() {
218218
var fileResolver = new resolver.FileNameResolver(androidPhonePortraitContext);
@@ -242,4 +242,4 @@ export function test_file_resolver_with_ios_phone_portrait() {
242242
var fileResolver = new resolver.FileNameResolver(iPhonePortraitContext);
243243
var result = fileResolver.resolveFileName(testFilePath, "xml");
244244
TKUnit.assertEqual(result, testFilePath + ".xml", "File path");
245-
}
245+
}

‎apps/tests/frame-tests.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export var test_DummyTestForSnippetOnly0 = function () {
1313
// <snippet module="ui/frame" title="frame">
1414
// ### Navigating to a Module
1515
// ``` JavaScript
16-
topmost.navigate("app/details-page");
16+
topmost.navigate("details-page");
1717
// ```
1818
// </snippet>
1919
}
@@ -39,7 +39,7 @@ export var test_DummyTestForSnippetOnly2 = function () {
3939
// ### Navigating with NavigationEntry
4040
// ``` JavaScript
4141
var navigationEntry = {
42-
moduleName: "app/details-page",
42+
moduleName: "details-page",
4343
context: { info: "something you want to pass to your page" },
4444
animated: false
4545
};
@@ -55,4 +55,4 @@ export var test_DummyTestForSnippetOnly3 = function () {
5555
topmost.goBack();
5656
// ```
5757
// </snippet>
58-
}
58+
}

‎apps/tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{ "name" : "Tests",
2-
"main" : "testRunner.js" }
2+
"main" : "app/app.js" }

‎apps/tests/pages/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import application = require("application");
2-
application.mainModule = "app/pages/page14";
2+
application.mainModule = "pages/page14";
33
application.start();

‎apps/tests/pages/file-load-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function createPage() {
77
var page = new pages.Page();
88
var lbl = new label.Label();
99

10-
var moduleName = "app/tests/pages/files/test";
10+
var moduleName = "tests/pages/files/test";
1111

1212
var resolver = new fileResolverModule.FileNameResolver({
1313
width: 400,

‎apps/tests/pages/navigation/pageA-new-activity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function createPage() {
1111
var btn = new button.Button();
1212
btn.text = "Page B new activity";
1313
btn.on(button.knownEvents.tap, function () {
14-
var nextPage = "app/tests/pages/navigation/pageB-new-activity";
14+
var nextPage = "tests/pages/navigation/pageB-new-activity";
1515
frame.topmost().navigate(nextPage);
1616
});
1717
stack.addChild(btn);

‎apps/tests/pages/navigation/pageA.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ export function createPage() {
1717
var btn = new button.Button();
1818
btn.text = "Page B";
1919
btn.on(button.knownEvents.tap, function () {
20-
var nextPage = "app/tests/pages/navigation/pageB";
20+
var nextPage = "tests/pages/navigation/pageB";
2121
frame.topmost().navigate(nextPage);
2222
});
2323
stack.addChild(btn);
2424

2525
var btnActivity = new button.Button();
2626
btnActivity.text = "start activity";
2727
btnActivity.on(button.knownEvents.tap, function () {
28-
var newPage = "app/tests/pages/navigation/pageA-new-activity";
28+
var newPage = "tests/pages/navigation/pageA-new-activity";
2929

3030
var newFrame = new frame.Frame();
3131
newFrame.navigate(newPage);
@@ -55,4 +55,4 @@ export function createPage() {
5555

5656
page.content = stack;
5757
return page;
58-
}
58+
}

‎apps/tests/pages/navigation/pageB-new-activity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function createPage() {
1111
var btn = new button.Button();
1212
btn.text = "Page C new activity";
1313
btn.on(button.knownEvents.tap, function () {
14-
var nextPage = "app/tests/pages/navigation/pageC-new-activity";
14+
var nextPage = "tests/pages/navigation/pageC-new-activity";
1515
frame.topmost().navigate(nextPage);
1616
});
1717
stack.addChild(btn);

‎apps/tests/pages/navigation/pageB.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function createPage() {
1414
var btn = new button.Button();
1515
btn.text = "Page C";
1616
btn.on(button.knownEvents.tap, function () {
17-
var nextPage = "app/tests/pages/navigation/pageC";
17+
var nextPage = "tests/pages/navigation/pageC";
1818
frame.topmost().navigate(nextPage);
1919
});
2020
stack.addChild(btn);
@@ -23,7 +23,7 @@ export function createPage() {
2323
btnActivity.text = "start activity";
2424
btnActivity.on(button.knownEvents.tap, function () {
2525
var newFrame = new frame.Frame();
26-
var newPage = "app/tests/pages/navigation/pageA-new-activity";
26+
var newPage = "tests/pages/navigation/pageA-new-activity";
2727
newFrame.navigate(newPage);
2828
});
2929
stack.addChild(btnActivity);
@@ -54,4 +54,4 @@ export function createPage() {
5454
page.content = stack;
5555
return page;
5656
}
57-
//export var Page = page;
57+
//export var Page = page;

‎apps/tests/pages/navigation/pageC-new-activity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function createPage() {
1111
var btn = new button.Button();
1212
btn.text = "Page A ???";
1313
btn.on(button.knownEvents.tap, function () {
14-
var newPage = "app/tests/pages/navigation/pageA";
14+
var newPage = "tests/pages/navigation/pageA";
1515
frame.topmost().navigate(newPage);
1616
});
1717
stack.addChild(btn);

‎apps/tests/pages/navigation/pageC.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ export function createPage() {
1212
newActivity.text = "start activity";
1313
newActivity.on(button.knownEvents.tap, function () {
1414
var newFrame = new frame.Frame();
15-
var newPage = "app/tests/pages/navigation/pageA-new-activity";
15+
var newPage = "tests/pages/navigation/pageA-new-activity";
1616
newFrame.navigate(newPage);
1717
});
1818
stack.addChild(newActivity);
1919

2020
var btn = new button.Button();
2121
btn.text = "Page A ???";
2222
btn.on(button.knownEvents.tap, function () {
23-
var nextPage = "app/tests/pages/navigation/pageA";
23+
var nextPage = "tests/pages/navigation/pageA";
2424
frame.topmost().navigate(nextPage);
2525
});
2626
stack.addChild(btn);

‎apps/tests/pages/page14.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<Image src="http://www.google.com/images/errors/logo_sm_2.png" stretch="none" horizontalAlignment="left"/>
88

99
<Label text="app file:" />
10-
<Image src="~/app/logo.png" stretch="none" horizontalAlignment="left" />
10+
<Image src="~/logo.png" stretch="none" horizontalAlignment="left" />
1111
</StackLayout>
1212
</Page>

‎apps/tests/styling/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ trace.setCategories(trace.categories.concat(
1010
//, trace.categories.VisualTreeEvents
1111
));
1212

13-
application.mainModule = "app/styling/mainPage";
13+
application.mainModule = "styling/mainPage";
1414
application.start();

‎apps/tests/ui/image/image-tests.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import ImageModule = require("ui/image");
1313
// <!--Bind the image source property to view-model property -->
1414
// {%raw%}<Image src="{{ thumbnailImageUrl }}" />{%endraw%}
1515
// <!--Load form image from application -->
16-
// <Image source="~/app/logo.png" stretch ="none" / >
16+
// <Image source="~/logo.png" stretch ="none" / >
1717
// <!--Load form image resource -->
18-
// <Image source="res://app/logo.png" stretch ="none" / >
18+
// <Image source="res://logo.png" stretch ="none" / >
1919
// <!--Load form image URL-->
2020
// <Image source="http://www.google.com/images/errors/logo_sm_2.png" stretch ="none" />
2121
// </StackLayout>
@@ -106,7 +106,7 @@ export var test_SettingImageSrcToFileWithinApp = function (done) {
106106
// ### How to create an image and set its src to file within the application.
107107
// ``` JavaScript
108108
var image = new ImageModule.Image();
109-
image.src = "~/app/logo.png";
109+
image.src = "~/logo.png";
110110
// ```
111111
// </snippet>
112112

‎apps/tests/ui/label/label-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ export var testLocalTextAlignmentFromCssWhenAddingCssFileAllSelectorsAreApplied
477477
view.id = "testLabel";
478478
var page = <page.Page>views[1];
479479
page.addCss("#testLabel { text-align: " + expectedTextAlignment + "; }");
480-
page.addCssFile("/app/tests/ui/label/label-tests.css");
480+
page.addCssFile("/tests/ui/label/label-tests.css");
481481

482482
var actualResult = view.style.textAlignment;
483483
// actual result is taken from #testLabel tag, because it has a greater priority (id vs type).
@@ -513,7 +513,7 @@ export var testErrorMessageWhenWrongCssIsAddedWithFile = function () {
513513
view.id = "testLabel";
514514
var page = <page.Page>views[1];
515515
errorMessage = undefined;
516-
page.addCssFile("/app/tests/ui/label/label-tests-wrong.css");
516+
page.addCssFile("/tests/ui/label/label-tests-wrong.css");
517517

518518
TKUnit.assertNotEqual(errorMessage, undefined);
519519
});

‎apps/tests/ui/page/page-tests-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export var test_FrameBackStack_WhenNavigatingForwardAndBack = function () {
237237
}
238238

239239
export var test_LoadPageFromModule = function () {
240-
helper.navigateToModule("app/ui/page/test-page-module");
240+
helper.navigateToModule("ui/page/test-page-module");
241241
try {
242242
var topFrame = FrameModule.topmost();
243243
TKUnit.assert(topFrame.currentPage.content instanceof LabelModule.Label, "Content of the test page should be a Label created within test-page-module.");

‎apps/tests/xml-declaration/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import application = require("application");
2-
application.mainModule = "app/xml-declaration/mainPage";
2+
application.mainModule = "xml-declaration/mainPage";
33
application.start();

‎apps/tests/xml-declaration/mainPage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="MyPageLoaded"
2-
xmlns:customControls="app/xml-declaration/mymodule"
3-
xmlns:customControls2="app/xml-declaration/mymodulewithxml">
2+
xmlns:customControls="xml-declaration/mymodule"
3+
xmlns:customControls2="xml-declaration/mymodulewithxml">
44
<TabView>
55
<TabView.items>
66
<TabViewItem title="Tab 1">
@@ -59,4 +59,4 @@
5959
</TabViewItem>
6060
</TabView.items>
6161
</TabView>
62-
</Page>
62+
</Page>

‎apps/tests/xml-declaration/mymodulewithxml/MyControl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<StackLayout xmlns:customControls="app/xml-declaration/mymodule">
1+
<StackLayout xmlns:customControls="xml-declaration/mymodule">
22
<Label id="Label1" text="mymodulewithxml" />
33
<Button text="Click!" tap="buttonTap2" />
44
</StackLayout>

0 commit comments

Comments
 (0)