test: Reproduce the existing test cases and new test cases for aapt2

Author: jmatsu

lib/android_apk.rb

@@ -9,14 +9,13 @@
 require_relative "android_apk/apksigner"
 require_relative "android_apk/app_icon"
 require_relative "android_apk/app_signature"
-require_relative "android_apk/configuration"
 require_relative "android_apk/error"
 require_relative "android_apk/resource_finder"
 require_relative "android_apk/signature_digest"
 require_relative "android_apk/signature_lineage_reader"
 require_relative "android_apk/signature_verifier"
 require_relative "android_apk/xmltree"
-require_relative "android_apk/aapt2/resource_finder"
+require_relative "android_apk/aapt2/dump_resources"
 
 class AndroidApk
   FALLBACK_DPI = 65_534

lib/android_apk/aapt2/dump_resources.rb

@@ -3,10 +3,16 @@
 class AndroidApk
   module Aapt2
     class DumpResources
+      def self.dump_resource_values(apk_filepath:)
+        stdout, _, status = Open3.capture3("aapt2", "dump", "resources", apk_filepath)
+        # we just need only drawables/mipmaps, and they are utf-8(ascii) friendly.
+        stdout if status.success?
+      end
+
       # @param apk_filepath [String] a path to apk_filepath
       def initialize(apk_filepath:)
         @apk_filepath = apk_filepath
-        @dump_results = dump_resource_values(apk_filepath: apk_filepath)&.scrub&.split("\n")
+        @dump_results = self.class.dump_resource_values(apk_filepath: apk_filepath)&.scrub&.split("\n")
       end
 
       # @param default_icon_path [String] the path to the default icon in the apk
@@ -65,7 +71,7 @@ def collect_in_section(lines:, pivot_index:, &block)
 
           break if dpi.nil? || path.nil? # unexpected.
 
-          dpi = dpi.empty? ? ::AndroidApk::DEFAULT_RESOURCE_CONFIG : dpi # reassign
+          dpi = ::AndroidApk::DEFAULT_RESOURCE_CONFIG if dpi.empty? # reassign
 
           block.call(dpi, path)
 
@@ -78,12 +84,6 @@ def collect_in_section(lines:, pivot_index:, &block)
           end
         end
       end
-
-      private def dump_resource_values(apk_filepath:)
-        stdout, _, status = Open3.capture3("aapt2", "dump", "resources", apk_filepath)
-        # we just need only drawables/mipmaps, and they are utf-8(ascii) friendly.
-        stdout if status.success?
-      end
     end
   end
 end

spec/android_apk/resource_finder_spec.rb

@@ -32,21 +32,15 @@
     # emulate
     context "sample.apk includes non UTF-8" do
       let(:apk_filepath) { File.join(FIXTURE_DIR, "other", "sample.apk") }
-      let(:aapt_output) do
-        stdout = AndroidApk::Aapt::ResourceFinder.dump_resource_values(apk_filepath: apk_filepath)
-        (+"#{stdout}\xFF").force_encoding("UTF-8")
-      end
       let(:aapt2_output) do
-        stdout = AndroidApk::Aapt2::ResourceFinder.dump_resource_values(apk_filepath: apk_filepath)
+        stdout = AndroidApk::Aapt2::DumpResources.dump_resource_values(apk_filepath: apk_filepath)
         (+"#{stdout}\xFF").force_encoding("UTF-8")
       end
 
       before do
-        allow(AndroidApk::Aapt::ResourceFinder).to receive(:dump_resource_values).and_return(aapt_output) # inject
-        allow(AndroidApk::Aapt2::ResourceFinder).to receive(:dump_resource_values).and_return(aapt2_output) # inject
+        allow(AndroidApk::Aapt2::DumpResources).to receive(:dump_resource_values).and_return(aapt2_output) # inject
       end
 
-      it { expect { aapt_output.split('\n') }.to raise_error(ArgumentError, "invalid byte sequence in UTF-8") }
       it { expect { aapt2_output.split('\n') }.to raise_error(ArgumentError, "invalid byte sequence in UTF-8") }
 
       it do