Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee0b809 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow alternate golden images for TestWithGoldenOutput" into main am: a2d6a9ed 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3367780



Change-Id: I26871b7faf6cb7cf7035a0076849edd4ffe57280
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a9c66e5 a2d6a9ed

ravenwood/tools/hoststubgen/test-tiny-framework/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ python_test_host { 
    ],

    data: [

        "golden-output/*.txt",

        "golden-output.RELEASE_TARGET_JAVA_21/*.txt",

    ],

    java_data: [

        "hoststubgen-test-tiny-framework-orig-dump",

ravenwood/tools/hoststubgen/test-tiny-framework/golden-output.RELEASE_TARGET_JAVA_21/01-hoststubgen-test-tiny-framework-orig-dump.txt

0 → 100644
+3697 −0

File added.

Preview size limit exceeded, changes collapsed.

ravenwood/tools/hoststubgen/test-tiny-framework/golden-output.RELEASE_TARGET_JAVA_21/03-hoststubgen-test-tiny-framework-host-dump.txt

0 → 100644
+3727 −0

File added.

Preview size limit exceeded, changes collapsed.

ravenwood/tools/hoststubgen/test-tiny-framework/golden-output.RELEASE_TARGET_JAVA_21/13-hoststubgen-test-tiny-framework-host-ext-dump.txt

0 → 100644
+4896 −0

File added.

Preview size limit exceeded, changes collapsed.

ravenwood/tools/hoststubgen/test-tiny-framework/tiny-framework-dump-test.py

+34 −14
Original line number Diff line number Diff line
@@ -20,18 +20,23 @@ import os 
import unittest

import subprocess



GOLDEN_DIR = 'golden-output'

GOLDEN_DIRS = [

    'golden-output',

    'golden-output.RELEASE_TARGET_JAVA_21',

]





# Run diff.

def run_diff(file1, file2):

    command = ['diff', '-u', '--ignore-blank-lines', '--ignore-space-change', file1, file2]

    command = ['diff', '-u', '--ignore-blank-lines',

               '--ignore-space-change', file1, file2]

    print(' '.join(command))

    result = subprocess.run(command, stderr=sys.stdout)



    success = result.returncode == 0



    if success:

        print(f'No diff found.')

        print('No diff found.')

    else:

        print(f'Fail: {file1} and {file2} are different.')
@@ -39,27 +44,42 @@ def run_diff(file1, file2): 




# Check one golden file.

def check_one_file(filename):

def check_one_file(golden_dir, filename):

    print(f'= Checking file: {filename}')

    return run_diff(os.path.join(GOLDEN_DIR, filename), filename)

    return run_diff(os.path.join(golden_dir, filename), filename)





class TestWithGoldenOutput(unittest.TestCase):



    # Test to check the generated jar files to the golden output.

    # Depending on build flags, the golden output may differ in expected ways.

    # So only expect the files to match one of the possible golden outputs.

    def test_compare_to_golden(self):

        self.skipTest("test cannot handle multiple images (see b/378470825)")

        files = os.listdir(GOLDEN_DIR)

        files.sort()

        success = False



        print(f"Golden files: {files}")

        for golden_dir in GOLDEN_DIRS:

            if self.matches_golden(golden_dir):

                success = True

                print(f"Test passes for dir: {golden_dir}")

                break



        if not success:

            self.fail('Some files are different. ' +

                      'See stdout log for more details.')



    def matches_golden(self, golden_dir):

        files = os.listdir(golden_dir)

        files.sort()



        print(f"Golden files for {golden_dir}: {files}")

        match_success = True



        for file in files:

            if not check_one_file(file):

                success = False

            if not check_one_file(golden_dir, file):

                match_success = False



        return match_success



        if not success:

            self.fail('Some files are different. See stdout log for more details.')



if __name__ == "__main__":

    unittest.main(verbosity=2)