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

Commit e7c3d3d4 authored by Sebastian Franco's avatar Sebastian Franco Committed by Sebastián Franco
Browse files

Parsing test boards from text files to be able to add more and bigger tests 

It also adds an assets folder inside of Launcher3 tests.

It also fixes a bug in fullReorder.

Test: atest ReorderWidgets
Flag: none
Bug: 229292911
Change-Id: I7dadd42a3057d353326691163bb7db71a2e9dcc4
parent 95b6f8c4

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ filegroup { 
android_library {

    name: "Launcher3TestLib",

    srcs: [ ],

    asset_dirs: ["assets"],

    resource_dirs: ["res"],

    static_libs: [

        "launcher-aosp-tapl",

tests/assets/ReorderWidgets/full_reorder_case

0 → 100644
+28 −0
Original line number Diff line number Diff line 
###################################################################################################

# This file contains test case composed of the following tags:

#     * # (coments): Lines starting with this character would be ignored.

#     * arguments: is set of words separated by spaces that can later be parsed

#     * board: represent a workspace, the first line is the dimensions of the board width x height (wxh)

# There are different characters on the board that represent different things:

#     * x: The x character represents spaces that would be ignored, for example it can be used in

#          the first row if we don't know how wide the smartspace is.

#     * i: Represents an icon on the workspace, none in particular just an icon

#     * [a-z]: Represents a widget and it can be any number or character

#          except any other already in use. The whole continuos are of the same character is the

#          area of the widget.

#     * [A-Z]: Represents a folder and number of icons in the folder is represented by the order of

#          letter in the alphabet, A=2, B=3, C=4 ... etc.

# Test are parsed by CellLayoutTestCaseReader.java and boards are parsed by CellLayoutBoard.java

###################################################################################################

# Test 4x4

board: 4x4

xxxx

bbmm

iimm

iiaa

arguments: 0 3

board: 4x4

xxxx

bbii

mmii

mmaa
 
 No newline at end of file

tests/assets/ReorderWidgets/move_out_reorder_case

0 → 100644
+44 −0
Original line number Diff line number Diff line 
###################################################################################################

# This file contains test case composed of the following tags:

#     * # (coments): Lines starting with this character would be ignored.

#     * arguments: is set of words separated by spaces that can later be parsed

#     * board: represent a workspace, the first line is the dimensions of the board width x height (wxh)

# There are different characters on the board that represent different things:

#     * x: The x character represents spaces that would be ignored, for example it can be used in

#          the first row if we don't know how wide the smartspace is.

#     * i: Represents an icon on the workspace, none in particular just an icon

#     * [a-z]: Represents a widget and it can be any number or character

#          except any other already in use. The whole continuos are of the same character is the

#          area of the widget.

#     * [A-Z]: Represents a folder and number of icons in the folder is represented by the order of

#          letter in the alphabet, A=2, B=3, C=4 ... etc.

# Test are parsed by CellLayoutTestCaseReader.java and boards are parsed by CellLayoutBoard.java

###################################################################################################

# Test 5x5

board: 5x5

xxxxx

cd-m-

cgaaa

ctaaa

ctaaa

arguments: 1 2

board: 5x5

xxxxx

cde--

cgaaa

ctaaa

ctaaa

# Test 6x5

board: 6x5

xxxxxx

cd-m--

cgaaaa

ctaaaa

ctaaaa

arguments: 1 2

board: 6x5

xxxxxx

cdg---

cmaaaa

ctaaaa

ctaaaa
 
 No newline at end of file

tests/assets/ReorderWidgets/push_reorder_case

0 → 100644
+44 −0
Original line number Diff line number Diff line 
###################################################################################################

# This file contains test case composed of the following tags:

#     * # (coments): Lines starting with this character would be ignored.

#     * arguments: is set of words separated by spaces that can later be parsed

#     * board: represent a workspace, the first line is the dimensions of the board width x height (wxh)

# There are different characters on the board that represent different things:

#     * x: The x character represents spaces that would be ignored, for example it can be used in

#          the first row if we don't know how wide the smartspace is.

#     * i: Represents an icon on the workspace, none in particular just an icon

#     * [a-z]: Represents a widget and it can be any number or character

#          except any other already in use. The whole continuos are of the same character is the

#          area of the widget.

#     * [A-Z]: Represents a folder and number of icons in the folder is represented by the order of

#          letter in the alphabet, A=2, B=3, C=4 ... etc.

# Test are parsed by CellLayoutTestCaseReader.java and boards are parsed by CellLayoutBoard.java

###################################################################################################

#Test 5x5

board: 5x5

xxxxx

bbbm-

--ccc

--ddd

-----

arguments: 2 1

board: 5x5

xxxxx

--m--

bbb--

--ccc

--ddd

#6x5 Test

board: 6x5

xxxxxx

bbbbm-

--aaa-

--ddd-

------

arguments: 2 1

board: 6x5

xxxxxx

--m---

bbbb--

--aaa-

--ddd-
 
 No newline at end of file

tests/assets/ReorderWidgets/simple_reorder_case

0 → 100644
+56 −0
Original line number Diff line number Diff line 
###################################################################################################

# This file contains test case composed of the following tags:

#     * # (coments): Lines starting with this character would be ignored.

#     * arguments: is set of words separated by spaces that can later be parsed

#     * board: represent a workspace, the first line is the dimensions of the board width x height (wxh)

# There are different characters on the board that represent different things:

#     * x: The x character represents spaces that would be ignored, for example it can be used in

#          the first row if we don't know how wide the smartspace is.

#     * i: Represents an icon on the workspace, none in particular just an icon

#     * [a-z]: Represents a widget and it can be any number or character

#          except any other already in use. The whole continuos are of the same character is the

#          area of the widget.

#     * [A-Z]: Represents a folder and number of icons in the folder is represented by the order of

#          letter in the alphabet, A=2, B=3, C=4 ... etc.

# Test are parsed by CellLayoutTestCaseReader.java and boards are parsed by CellLayoutBoard.java

###################################################################################################

# Test 5x5

board: 5x5

xxxxx

--mm-

--mm-

-----

-----

arguments: 0 4

board: 5x5

xxxxx

-----

-----

mm---

mm---

# Test 4x4

board: 4x4

xxxx

--mm

--mm

----

arguments: 3 3

board: 4x4

xxxx

----

--mm

--mm

# Test 6x5

board: 6x5

xxxxxx

-mm---

-mm---

------

------

arguments: 4 3

board: 6x5

xxxxxx

------

------

----mm

----mm
 
 No newline at end of file