Android tests: add cases with/out Universal APK

Author: AliSoftware

spec/android_send_app_size_metrics_spec.rb

@@ -3,38 +3,54 @@
 describe Fastlane::Actions::AndroidSendAppSizeMetricsAction do
   let(:test_data_dir) { File.join(File.dirname(__FILE__), 'test-data', 'app_size_metrics') }
 
-  def test_app_size_action(fake_aab_size:, fake_apks:, expected_payload:, **other_action_args)
+  def test_app_size_action(fake_aab_size:, fake_apks:, fake_universal_apk_sizes:, expected_payload:, **other_action_args)
     in_tmp_dir do |tmp_dir|
       # Arrange
       output_file = File.join(tmp_dir, 'output-payload')
-      aab_path = File.join(tmp_dir, 'fake.aab')
-      File.write(aab_path, '-fake-aab-file-')
-      allow(File).to receive(:size).with(aab_path).and_return(fake_aab_size)
+      aab_path = nil
+      unless fake_aab_size.nil?
+        aab_path = File.join(tmp_dir, 'fake.aab')
+        File.write(aab_path, '-fake-aab-file-')
+        allow(File).to receive(:size).with(aab_path).and_return(fake_aab_size)
+      end
+      universal_apk_path = nil
+      unless fake_universal_apk_sizes.empty?
+        universal_apk_path = File.join(tmp_dir, 'fake.apk')
+        File.write(universal_apk_path, '-fake-universal-apk-file-')
+        allow(File).to receive(:size).with(universal_apk_path).and_return(fake_universal_apk_sizes[0])
+      end
 
       if other_action_args[:include_split_sizes] != false
         # Arrange: fake that apkanalyzer exists
         apkanalyzer_bin = File.join('__ANDROID_SDK_ROOT__FOR_TESTS__', 'cmdline-tools', 'latest', 'bin', 'apkanalyzer')
         allow(described_class).to receive(:find_apkanalyzer_binary).and_return(apkanalyzer_bin)
         allow(File).to receive(:executable?).with(apkanalyzer_bin).and_return(true)
 
-        # Arrange: fake that bundletool exists and mock its call to create fake apks with corresponding apkanalyzer calls mocks
-        allow(Fastlane::Action).to receive(:sh).with('command', '-v', 'bundletool', anything)
-        allow(Fastlane::Action).to receive(:sh).with('bundletool', 'build-apks', '--bundle', aab_path, '--output-format', 'DIRECTORY', '--output', anything) do |*args|
-          bundletool_tmpdir = args.last
-          FileUtils.mkdir(File.join(bundletool_tmpdir, 'splits'))
-          fake_apks.each do |apk_name, sizes|
-            apk_path = File.join(bundletool_tmpdir, 'splits', apk_name.to_s)
-            File.write(apk_path, "Fake APK file (#{sizes})")
-            allow(Fastlane::Action).to receive(:sh).with(apkanalyzer_bin, 'apk', 'file-size', apk_path, anything).and_return(sizes[0].to_s)
-            allow(Fastlane::Action).to receive(:sh).with(apkanalyzer_bin, 'apk', 'download-size', apk_path, anything).and_return(sizes[1].to_s)
+        unless fake_apks.empty?
+          # Arrange: fake that `bundletool` exists and mock its call to create fake apks with corresponding apkanalyzer calls mocks
+          allow(Fastlane::Action).to receive(:sh).with('command', '-v', 'bundletool', anything)
+          allow(Fastlane::Action).to receive(:sh).with('bundletool', 'build-apks', '--bundle', aab_path, '--output-format', 'DIRECTORY', '--output', anything) do |*args|
+            bundletool_tmpdir = args.last
+            FileUtils.mkdir(File.join(bundletool_tmpdir, 'splits'))
+            fake_apks.each do |apk_name, sizes|
+              apk_path = File.join(bundletool_tmpdir, 'splits', apk_name.to_s)
+              File.write(apk_path, "Fake APK file (#{sizes})")
+              allow(Fastlane::Action).to receive(:sh).with(apkanalyzer_bin, 'apk', 'file-size', apk_path, anything).and_return(sizes[0].to_s)
+              allow(Fastlane::Action).to receive(:sh).with(apkanalyzer_bin, 'apk', 'download-size', apk_path, anything).and_return(sizes[1].to_s)
+            end
           end
         end
+        unless fake_universal_apk_sizes.empty?
+          allow(Fastlane::Action).to receive(:sh).with(apkanalyzer_bin, 'apk', 'file-size', universal_apk_path, anything).and_return(fake_universal_apk_sizes[1].to_s)
+          allow(Fastlane::Action).to receive(:sh).with(apkanalyzer_bin, 'apk', 'download-size', universal_apk_path, anything).and_return(fake_universal_apk_sizes[2].to_s)
+        end
       end
 
       # Act
       code = run_described_fastlane_action(
         api_url: File.join('file://localhost/', output_file),
         aab_path: aab_path,
+        universal_apk_path: universal_apk_path,
         **other_action_args
       )
 
@@ -51,6 +67,17 @@ def test_app_size_action(fake_aab_size:, fake_apks:, expected_payload:, **other_
   end
 
   context 'when `include_split_sizes` is turned off' do
+    let(:common_action_args) do
+      {
+        app_name: 'my-app',
+        app_version_name: '10.2-rc-3',
+        product_flavor: 'Vanilla',
+        build_type: 'Release',
+        source: 'unit-test',
+        include_split_sizes: false
+      }
+    end
+
     context 'when only providing an `aab_path`' do
       it 'generates the expected payload compressed by default' do
         expected = {
@@ -70,13 +97,9 @@ def test_app_size_action(fake_aab_size:, fake_apks:, expected_payload:, **other_
         test_app_size_action(
           fake_aab_size: 123_456,
           fake_apks: {},
+          fake_universal_apk_sizes: [],
           expected_payload: expected,
-          app_name: 'my-app',
-          app_version_name: '10.2-rc-3',
-          product_flavor: 'Vanilla',
-          build_type: 'Release',
-          source: 'unit-test',
-          include_split_sizes: false
+          **common_action_args
         )
       end
 
@@ -92,37 +115,90 @@ def test_app_size_action(fake_aab_size:, fake_apks:, expected_payload:, **other_
           ],
           metrics: [
             { name: 'AAB File Size', value: 123_456 },
+            { name: 'Universal APK File Size', value: 56_789 },
           ]
         }
 
         test_app_size_action(
           fake_aab_size: 123_456,
           fake_apks: {},
+          fake_universal_apk_sizes: [56_789],
           expected_payload: expected,
-          app_name: 'my-app',
-          app_version_name: '10.2-rc-3',
-          product_flavor: 'Vanilla',
-          build_type: 'Release',
-          source: 'unit-test',
-          include_split_sizes: false,
+          **common_action_args,
           use_gzip_content_encoding: false
         )
       end
     end
 
     context 'when only providing an `universal_apk_path`' do
-      it 'generates the expected payload containing the apk file size'
+      it 'generates the expected payload containing the apk file size' do
+        expected = {
+          meta: [
+            { name: 'Platform', value: 'Android' },
+            { name: 'App Name', value: 'my-app' },
+            { name: 'App Version', value: '10.2-rc-3' },
+            { name: 'Product Flavor', value: 'Vanilla' },
+            { name: 'Build Type', value: 'Release' },
+            { name: 'Source', value: 'unit-test' },
+          ],
+          metrics: [
+            { name: 'Universal APK File Size', value: 567_654_321 },
+          ]
+        }
+
+        test_app_size_action(
+          fake_aab_size: nil,
+          fake_apks: {},
+          fake_universal_apk_sizes: [567_654_321],
+          expected_payload: expected,
+          **common_action_args
+        )
+      end
     end
 
     context 'when providing both an `aab_path` and an `universal_apk_path`' do
-      it 'generates the expected payload containing the aab and universal apk file size'
+      it 'generates the expected payload containing the aab and universal apk file size' do
+        expected = {
+          meta: [
+            { name: 'Platform', value: 'Android' },
+            { name: 'App Name', value: 'my-app' },
+            { name: 'App Version', value: '10.2-rc-3' },
+            { name: 'Product Flavor', value: 'Vanilla' },
+            { name: 'Build Type', value: 'Release' },
+            { name: 'Source', value: 'unit-test' },
+          ],
+          metrics: [
+            { name: 'AAB File Size', value: 123_456 },
+            { name: 'Universal APK File Size', value: 567_654_321 },
+          ]
+        }
+
+        test_app_size_action(
+          fake_aab_size: 123_456,
+          fake_apks: {},
+          fake_universal_apk_sizes: [567_654_321],
+          expected_payload: expected,
+          **common_action_args
+        )
+      end
     end
   end
 
   context 'when keeping the default value of `include_split_sizes` turned on' do
+    let(:common_action_args) do
+      {
+        app_name: 'wordpress',
+        app_version_name: '19.8-rc-3',
+        app_version_code: 1214,
+        product_flavor: 'Vanilla',
+        build_type: 'Release',
+        source: 'unit-test'
+      }
+    end
+
     context 'when only providing an `aab_path`' do
       it 'generates the expected payload containing the aab file size and optimized split sizes' do
-        expected_fixture = File.join(test_data_dir, 'android-metrics-payload.json')
+        expected_fixture = File.join(test_data_dir, 'android-metrics-payload-aab.json')
         expected = JSON.parse(File.read(expected_fixture))
 
         test_app_size_action(
@@ -135,23 +211,48 @@ def test_app_size_action(fake_aab_size:, fake_apks:, expected_payload:, **other_
             'base-armeabi_v7a.apk': [150_070, 50_070],
             'base-armeabi_v7a_2.apk': [150_072, 50_072]
           },
+          fake_universal_apk_sizes: [],
           expected_payload: expected,
-          app_name: 'wordpress',
-          app_version_name: '19.8-rc-3',
-          app_version_code: 1214,
-          product_flavor: 'Vanilla',
-          build_type: 'Release',
-          source: 'unit-test'
+          **common_action_args
         )
       end
     end
 
     context 'when only providing an `universal_apk_path`' do
-      it 'generates the expected payload containing the apk file size and optimized file and download sizes'
+      it 'generates the expected payload containing the apk file size and optimized file and download sizes' do
+        expected_fixture = File.join(test_data_dir, 'android-metrics-payload-apk.json')
+        expected = JSON.parse(File.read(expected_fixture))
+
+        test_app_size_action(
+          fake_aab_size: nil,
+          fake_apks: {},
+          fake_universal_apk_sizes: [567_654_321, 555_000, 533_000],
+          expected_payload: expected,
+          **common_action_args
+        )
+      end
     end
 
     context 'when providing both an `aab_path` and an `universal_apk_path`' do
-      it 'generates the expected payload containing the aab and universal apk file size and optimized file and download sizes for all splits'
+      it 'generates the expected payload containing the aab and universal apk file size and optimized file and download sizes for all splits' do
+        expected_fixture = File.join(test_data_dir, 'android-metrics-payload-aab+apk.json')
+        expected = JSON.parse(File.read(expected_fixture))
+
+        test_app_size_action(
+          fake_aab_size: 987_654_321,
+          fake_apks: {
+            'base-arm64_v8a.apk': [164_080, 64_080],
+            'base-arm64_v8a_2.apk': [164_082, 64_082],
+            'base-armeabi.apk': [150_000, 50_000],
+            'base-armeabi_2.apk': [150_002, 50_002],
+            'base-armeabi_v7a.apk': [150_070, 50_070],
+            'base-armeabi_v7a_2.apk': [150_072, 50_072]
+          },
+          fake_universal_apk_sizes: [567_654_321, 555_000, 533_000],
+          expected_payload: expected,
+          **common_action_args
+        )
+      end
     end
   end
 end

spec/test-data/app_size_metrics/android-metrics-payload-aab+apk.json

@@ -0,0 +1,29 @@
+{
+  "meta": [
+    { "name": "Platform", "value": "Android" },
+    { "name": "App Name", "value": "wordpress" },
+    { "name": "App Version", "value": "19.8-rc-3" },
+    { "name": "Version Code", "value": 1214 },
+    { "name": "Product Flavor", "value": "Vanilla" },
+    { "name": "Build Type", "value": "Release" },
+    { "name": "Source", "value": "unit-test" }
+  ],
+  "metrics": [
+    { "name": "AAB File Size", "value": 987654321 },
+    { "name": "Universal APK File Size", "value": 567654321 },
+    { "name": "Optimized APK File Size", "value": 164082, "meta": [{ "name": "split", "value": "base-arm64_v8a_2" }] },
+    { "name": "Download Size", "value": 64082, "meta": [{ "name": "split", "value": "base-arm64_v8a_2" }] },
+    { "name": "Optimized APK File Size", "value": 150072, "meta": [{ "name": "split", "value": "base-armeabi_v7a_2" }] },
+    { "name": "Download Size", "value": 50072, "meta": [{ "name": "split", "value": "base-armeabi_v7a_2" }] },
+    { "name": "Optimized APK File Size", "value": 150002, "meta": [{ "name": "split", "value": "base-armeabi_2" }] },
+    { "name": "Download Size", "value": 50002, "meta": [{ "name": "split", "value": "base-armeabi_2" }] },
+    { "name": "Optimized APK File Size", "value": 164080, "meta": [{ "name": "split", "value": "base-arm64_v8a" }] },
+    { "name": "Download Size", "value": 64080, "meta": [{ "name": "split", "value": "base-arm64_v8a" }] },
+    { "name": "Optimized APK File Size", "value": 150000, "meta": [{ "name": "split", "value": "base-armeabi" }] },
+    { "name": "Download Size", "value": 50000, "meta": [{ "name": "split", "value": "base-armeabi" }] },
+    { "name": "Optimized APK File Size", "value": 150070, "meta": [{ "name": "split", "value": "base-armeabi_v7a" }] },
+    { "name": "Download Size", "value": 50070, "meta": [{ "name": "split", "value": "base-armeabi_v7a" }] },
+    { "name": "Optimized APK File Size", "value": 555000, "meta": [{ "name": "split", "value": "Universal" }] },
+    { "name": "Download Size", "value": 533000, "meta": [{ "name": "split", "value": "Universal" }] }
+  ]
+}

spec/test-data/app_size_metrics/android-metrics-payload.json renamed to spec/test-data/app_size_metrics/android-metrics-payload-aab.json

@@ -0,0 +1,16 @@
+{
+  "meta": [
+    { "name": "Platform", "value": "Android" },
+    { "name": "App Name", "value": "wordpress" },
+    { "name": "App Version", "value": "19.8-rc-3" },
+    { "name": "Version Code", "value": 1214 },
+    { "name": "Product Flavor", "value": "Vanilla" },
+    { "name": "Build Type", "value": "Release" },
+    { "name": "Source", "value": "unit-test" }
+  ],
+  "metrics": [
+    { "name": "Universal APK File Size", "value": 567654321 },
+    { "name": "Optimized APK File Size", "value": 555000, "meta": [{ "name": "split", "value": "Universal" }] },
+    { "name": "Download Size", "value": 533000, "meta": [{ "name": "split", "value": "Universal" }] }
+  ]
+}