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

Commit d38fffd3 authored by Jerome Gaillard's avatar Jerome Gaillard
Browse files

Store failure thumbnails in CWD/out/failures 

When a test fails in layoutlib, store the resulting png files in
out/failures subdirectory of the current working directory.
That avoids the risk of collisions if tests for several branches
of layoutlib are run at the same time.

Test: Run tests in layoutlib with at least one failing test
Change-Id: I31594a871e481e6aa410a165926ce544dc7ddcf2
(cherry picked from commit 82ebb9058479de56860f348ab969160e0d8294b6)
parent 5ce42bba

tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/ImageUtils.java

+9 −8
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class ImageUtils { 
                g.drawString("Actual", 2 * imageWidth + 10, 20);

            }



            File output = new File(getTempDir(), "delta-" + imageName);

            File output = new File(getFailureDir(), "delta-" + imageName);

            if (output.exists()) {

                boolean deleted = output.delete();

                assertTrue(deleted);
@@ -302,15 +302,16 @@ public class ImageUtils { 
    }



    /**

     * Temp directory where to write the thumbnails and deltas.

     * Directory where to write the thumbnails and deltas.

     */

    @NonNull

    private static File getTempDir() {

        if (System.getProperty("os.name").equals("Mac OS X")) {

            return new File("/tmp"); //$NON-NLS-1$

        }

    private static File getFailureDir() {

        String workingDirString = System.getProperty("user.dir");

        File failureDir = new File(workingDirString, "out/failures");



        return new File(System.getProperty("java.io.tmpdir")); //$NON-NLS-1$

        //noinspection ResultOfMethodCallIgnored

        failureDir.mkdirs();

        return failureDir; //$NON-NLS-1$

    }



    /**
@@ -319,7 +320,7 @@ public class ImageUtils { 
    @NonNull

    private static String saveImageAndAppendMessage(@NonNull BufferedImage image,

            @NonNull String initialMessage, @NonNull String relativePath) throws IOException {

        File output = new File(getTempDir(), getName(relativePath));

        File output = new File(getFailureDir(), getName(relativePath));

        if (output.exists()) {

            boolean deleted = output.delete();

            assertTrue(deleted);