test-projectinfo-android.rb in rake-delphi-0.0.31

- old
+ new
@@ -62,35 +62,23 @@
       tested_deploymentFiles_prefixes = { 36 => 'l', 48 => 'm', 72 => 'h', 96 => 'xh', 144 => 'xxh'}
       [36, 48, 72, 96, 144].each do |n|
         tested_deploymentFiles << '$(BDS)\bin\Artwork\Android\FM_LauncherIcon_%dx%d.png,res\drawable-%sdpi\,1,ic_launcher.png' % [n, n, tested_deploymentFiles_prefixes[n]]
       end
       tested_deploymentFiles << 'project_so,library\lib\armeabi\,1,libTestProject.so'
-      tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.dex'
+      tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.debug.dex'
       deploymentfiles = @info.deploymentfiles('Android', 'Debug')
-      assert deploymentfiles.kind_of?(Array), 'NOT an Array?!'
-      assert_not_equal 0, deploymentfiles.size, 'No files?!'
-      deploymentfiles.each do |dfile|
-        assert dfile.kind_of?(Hash), 'NOT a Hash?!'
-        assert_equal 1, dfile.keys.count, 'More than one value?!'
-        assert dfile.keys.first.kind_of?(String) || dfile.keys.first.kind_of?(Symbol), 'Key is NOT a String or Symbol?!'
-        assert dfile.values.first.kind_of?(Array), 'Value is NOT an Array?!'
-        assert tested_deploymentFiles.include?(dfile.to_a.join(',')), dfile.to_a.join(',')
-      end
+
+      _test_deploy_files(deploymentfiles, tested_deploymentFiles)
     end
 
     def test_deploy_files_Android_Release
       tested_deploymentFiles = []
       tested_deploymentFiles << 'some\deployment\file\from\enabled.release.conf,.\,1,enabled.release.conf.file'
+      # classes.dex must present both in Release and Debug configurations
+      tested_deploymentFiles << '$(BDS)\lib\android\debug\classes.dex,classes\,1,classes.release.dex'
       deploymentfiles = @info.deploymentfiles('Android', 'Release')
-      assert deploymentfiles.kind_of?(Array), 'NOT an Array?!'
-      assert_not_equal 0, deploymentfiles.size, 'No files?!'
-      deploymentfiles.each do |dfile|
-        assert dfile.kind_of?(Hash), 'NOT a Hash?!'
-        assert_equal 1, dfile.keys.count, 'More than one value?!'
-        assert dfile.keys.first.kind_of?(String) || dfile.keys.first.kind_of?(Symbol), 'Key is NOT a String or Symbol?!'
-        assert dfile.values.first.kind_of?(Array), 'Value is NOT an Array?!'
-        assert tested_deploymentFiles.include?(dfile.to_a.join(',')), dfile.to_a.join(',')
-      end
+
+      _test_deploy_files(deploymentfiles, tested_deploymentFiles)
     end
   end
 
 end