javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #251 from NativeScript/feature/file-name-resolver-tests-fix

Browse Source 
Feature/file name resolver tests fix
This commit is contained in:
Alexander Vakrilov
2015-04-08 10:17:52 +03:00
parent 9c62d60058 cbbd28be6b
commit d2160f7aa8
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CrossPlatformModules.csproj
View File

@ -574,9 +574,8 @@
<Content Include="apps\tests\pages\files\test.minWH450.xml" />
<Content Include="apps\tests\pages\files\test.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\other.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\test.android.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\test.ios.land.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\test.android.minWH600.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\test.land.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\test.minWH600.xml" />
<Content Include="apps\tests\file-name-resolver-tests\files\test.xml" />
<Content Include="apps\tests\pages\page17.xml">
<SubType>Designer</SubType>
@ -1532,7 +1531,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
<UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>

10
apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
View File

@ -212,30 +212,30 @@ function testTemplate(candidates: Array<string>, context: resolver.PlatformConte
TKUnit.assertEqual(result, expected, "File path");
}
var testFilePath = fs.path.join(fs.knownFolders.currentApp().path, "tests/file-name-resolver-tests/files/test");
var testFilePath = "~/file-name-resolver-tests/files/test".replace("~", fs.knownFolders.currentApp().path);
export function test_file_resolver_with_andorid_phone_portratit() {
var fileResolver = new resolver.FileNameResolver(androidPhonePortraitContext);
var result = fileResolver.resolveFileName(testFilePath, "xml");
TKUnit.assertEqual(result, testFilePath + ".android.xml", "File path");
TKUnit.assertEqual(result, testFilePath + ".xml", "File path");
}
export function test_file_resolver_with_andorid_phone_landscape() {
var fileResolver = new resolver.FileNameResolver(androidPhoneLandsacpeContext);
var result = fileResolver.resolveFileName(testFilePath, "xml");
TKUnit.assertEqual(result, testFilePath + ".android.xml", "File path");
TKUnit.assertEqual(result, testFilePath + ".land.xml", "File path");
}
export function test_file_resolver_with_andorid_tablet_portrait() {
var fileResolver = new resolver.FileNameResolver(androidTabletPortraitContext);
var result = fileResolver.resolveFileName(testFilePath, "xml");
TKUnit.assertEqual(result, testFilePath + ".android.minWH600.xml", "File path");
TKUnit.assertEqual(result, testFilePath + ".minWH600.xml", "File path");
}
export function test_file_resolver_with_ios_phone_landscape() {
var fileResolver = new resolver.FileNameResolver(iPhoneLandscapeContext);
var result = fileResolver.resolveFileName(testFilePath, "xml");
TKUnit.assertEqual(result, testFilePath + ".ios.land.xml", "File path");
TKUnit.assertEqual(result, testFilePath + ".land.xml", "File path");
}
export function test_file_resolver_with_ios_phone_portrait() {

1
apps/tests/file-name-resolver-tests/files/test.android.xml
View File

@ -1 +0,0 @@
test.android.xml

0
apps/tests/file-name-resolver-tests/files/test.ios.land.xml → apps/tests/file-name-resolver-tests/files/test.land.xml
View File

0
apps/tests/file-name-resolver-tests/files/test.android.minWH600.xml → apps/tests/file-name-resolver-tests/files/test.minWH600.xml
View File