From 8750383cdf18bf0934b2ac1e23ae1473d9c0bd51 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Wed, 18 Dec 2024 15:46:09 +0100 Subject: [PATCH 1/5] fix: make android mocha tests run again --- build/lib/test/test.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/lib/test/test.js b/build/lib/test/test.js index 81392c1f4ef..b69e2f5e20a 100644 --- a/build/lib/test/test.js +++ b/build/lib/test/test.js @@ -221,7 +221,7 @@ async function addTiAppProperties() { const tiapp_xml_string = await fs.readFile(tiapp_xml, 'utf8'); const content = []; const insertManifest = () => { - content.push('\t\t\t'); + content.push('\t\t\t'); content.push('\t\t\t\t'); content.push('\t\t\t\t'); content.push(`\t\t\t\t`); @@ -291,7 +291,7 @@ async function addTiAppProperties() { content.push('\t\t\t\t\t\tUIApplicationShortcutItemType'); content.push('\t\t\t\t\t\tstatic_shortcut1'); content.push('\t\t\t\t\t'); - content.push('\t\t\t\t'); }; // Not so smart but this should work... @@ -300,6 +300,9 @@ async function addTiAppProperties() { if (line.indexOf('\t') >= 0) { line = '\t1c4b748c-7c16-4df1-bd5c-4ffe6240286e'; } + if (line.indexOf('') > 0) { + line = ''; + } content.push(line); if (line.indexOf('') >= 0) { From 11f109e6d4011b7c71d17f60bf10b8df7120edc7 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 19 Dec 2024 13:05:49 +0100 Subject: [PATCH 2/5] fixing some tests --- .../ti/modules/titanium/ui/widget/TiUILabel.java | 6 +++++- .../snapshots/textfieldPadding@2.625x.png | Bin 0 -> 3583 bytes tests/Resources/ti.network.httpclient.test.js | 6 +++--- tests/Resources/ti.ui.listview.test.js | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 tests/Resources/android/snapshots/textfieldPadding@2.625x.png diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java index 3198fdbea7a..77e5e97facf 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java @@ -809,6 +809,10 @@ public int getLineCount() public String getVisibleText() { MaterialTextView textView = (MaterialTextView) getNativeView(); - return textView.getLayout().getText().toString(); + if (textView != null && textView.getLayout() != null) { + return textView.getLayout().getText().toString(); + } else { + return ""; + } } } diff --git a/tests/Resources/android/snapshots/textfieldPadding@2.625x.png b/tests/Resources/android/snapshots/textfieldPadding@2.625x.png new file mode 100644 index 0000000000000000000000000000000000000000..5224d457efc691e9ff3cf4e9ff843546320eb936 GIT binary patch literal 3583 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\s*\s*)?()?Yes/); - should(html).match(/id="protocol_tls1_3">()?Yes/); + should(html).match(/TLS 1.3/); } catch (err) { return finish(err); } @@ -755,7 +755,7 @@ describe('Titanium.Network.HTTPClient', function () { onerror: _e => finish(new Error('Could not determine TLSv3 support.')), timeout: 8000 }); - client.open('GET', 'https://clienttest.ssllabs.com/ssltest/viewMyClient.html'); + client.open('GET', 'https://www.howsmyssl.com/a/check'); client.send(); }); diff --git a/tests/Resources/ti.ui.listview.test.js b/tests/Resources/ti.ui.listview.test.js index c84179eb168..0901c891f14 100644 --- a/tests/Resources/ti.ui.listview.test.js +++ b/tests/Resources/ti.ui.listview.test.js @@ -1418,7 +1418,8 @@ describe('Titanium.UI.ListView', function () { should(view).matchImage('snapshots/listViewItem_template.png', { maxPixelMismatch: OS_IOS ? 23 : 0 }); // 23 pixels differ on actual iPhone }); - it('ListView header & footer', function () { + it.skip('ListView header & footer', function () { + // FIXME: Not working in latest SDK // FIXME: Does not honour scale correctly on macOS: https://jira-archive.titaniumsdk.com/TIMOB-28261 if (isCI && utilities.isMacOS() && OS_VERSION_MAJOR < 11) { this.skip(); From bb9470d287a45764f1ba9a835c6d8a1285166916 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Sat, 21 Dec 2024 13:45:15 +0100 Subject: [PATCH 3/5] Update tests/Resources/ti.ui.listview.test.js --- tests/Resources/ti.ui.listview.test.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Resources/ti.ui.listview.test.js b/tests/Resources/ti.ui.listview.test.js index 0901c891f14..53c4745a614 100644 --- a/tests/Resources/ti.ui.listview.test.js +++ b/tests/Resources/ti.ui.listview.test.js @@ -1418,8 +1418,7 @@ describe('Titanium.UI.ListView', function () { should(view).matchImage('snapshots/listViewItem_template.png', { maxPixelMismatch: OS_IOS ? 23 : 0 }); // 23 pixels differ on actual iPhone }); - it.skip('ListView header & footer', function () { - // FIXME: Not working in latest SDK + itListView header & footer', function () { // FIXME: Does not honour scale correctly on macOS: https://jira-archive.titaniumsdk.com/TIMOB-28261 if (isCI && utilities.isMacOS() && OS_VERSION_MAJOR < 11) { this.skip(); From f67241b7d396dbf889b0e802e145dcb89bbf7ae2 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Sat, 21 Dec 2024 13:45:33 +0100 Subject: [PATCH 4/5] Update tests/Resources/ti.ui.listview.test.js --- tests/Resources/ti.ui.listview.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Resources/ti.ui.listview.test.js b/tests/Resources/ti.ui.listview.test.js index 53c4745a614..c84179eb168 100644 --- a/tests/Resources/ti.ui.listview.test.js +++ b/tests/Resources/ti.ui.listview.test.js @@ -1418,7 +1418,7 @@ describe('Titanium.UI.ListView', function () { should(view).matchImage('snapshots/listViewItem_template.png', { maxPixelMismatch: OS_IOS ? 23 : 0 }); // 23 pixels differ on actual iPhone }); - itListView header & footer', function () { + it('ListView header & footer', function () { // FIXME: Does not honour scale correctly on macOS: https://jira-archive.titaniumsdk.com/TIMOB-28261 if (isCI && utilities.isMacOS() && OS_VERSION_MAJOR < 11) { this.skip(); From 8c29f3e1d7b016503ebd9fdb2b21b06da86ace93 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Sun, 26 Jan 2025 11:09:04 +0100 Subject: [PATCH 5/5] revert code change --- .../src/java/ti/modules/titanium/ui/widget/TiUILabel.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java index 77e5e97facf..3198fdbea7a 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java @@ -809,10 +809,6 @@ public int getLineCount() public String getVisibleText() { MaterialTextView textView = (MaterialTextView) getNativeView(); - if (textView != null && textView.getLayout() != null) { - return textView.getLayout().getText().toString(); - } else { - return ""; - } + return textView.getLayout().getText().toString(); } }