Merge branch 'zdy'

2024-01-17 22:48:30 +08:00
parent ba8ae104cf 19214f2107
commit d3a9e5088d
27 changed files with 818 additions and 151 deletions
--- a/evaluation_examples/examples/libreoffice_calc/0bf05a7d-b28b-44d2-955a-50b41e24012a.json
+++ b/evaluation_examples/examples/libreoffice_calc/0bf05a7d-b28b-44d2-955a-50b41e24012a.json
@@ -3,20 +3,101 @@
  "snapshot": "libreoffice_calc",
  "instruction": "I would like to pad all the numbers in the 'Old ID' column with zeros in front, to fill them up to seven digits in the 'New 7 Digit ID' column.",
  "source": "https://www.youtube.com/shorts/FPAQaDTS8VY",
-  "config": {
-    "download": [
-      [
-        "",
-        "C:\\Users\\tianbaox\\Desktop\\Customers_New_7digit_Id.xlsx"
-      ]
-    ],
-    "open": [
-      "C:\\Users\\tianbaox\\Desktop\\Customers_New_7digit_Id.xlsx"
-    ]
+  "config": [
+    {
+      "type": "download",
+      "parameters": {
+        "file": [
+          {
+            "url": "https://drive.usercontent.google.com/download?id=1DqGy5JRKOuZMRJ8O76d4Cds4WaRyz8V1&export=download&authuser=0&confirm=t&uuid=fa0694d1-2a77-4fd2-89d3-d9b854317823&at=APZUnTU9BxqG7E8tLZ104c0E8BEL:1705501029016",
+            "path": "/home/user/Customers_New_7digit_Id.xlsx"
+          }
+        ]
+      }
+    },
+    {
+      "type": "open",
+      "parameters": {
+        "path": "/home/user/Customers_New_7digit_Id.xlsx"
+      }
+    }
  },
  "trajectory": "trajectories/0bf05a7d-b28b-44d2-955a-50b41e24012a",
  "related_apps": [
    "libreoffice calc"
  ],
-  "evaluator": "evaluation_dir"
+  "evaluator": {
+    "postconfig": [
+			{
+				"type": "activate_window",
+				"parameters": {
+					"window_name": "Customers_New_7digit_Id.xlsx - LibreOffice Calc",
+					"strict": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"python",
+						"-c",
+						"import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+					]
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"libreoffice",
+						"--convert-to",
+						"csv:Text - txt - csv (StarCalc):44,34,UTF-8,,,,false,true,true",
+						"--outdir",
+						"/home/user",
+						"/home/user/Customers_New_7digit_Id.xlsx"
+					]
+				}
+			}
+    ],
+    "func": "compare_table",
+    "result": {
+      "type": "vm_file",
+      "path": [
+        "/home/user/Customers_New_7digit_Id.xlsx",
+        "/home/user/Customers_New_7digit_Id.csv"
+      ],
+      "dest": [
+        "Customers_New_7digit_Id.xlsx",
+        "Customers_New_7digit_Id.csv"
+      ],
+      "multi": true
+    },
+    "expected": {
+      "type": "cloud_file",
+      "path": [
+        "https://drive.usercontent.google.com/download?id=1zXz5k5A403IR0GE6DRRXRgQZrSIoVFSz&export=download&authuser=0&confirm=t&uuid=ba70b841-969c-4d91-9288-0011aeecf251&at=APZUnTWx3LL9udCgJAh-VMFzzfod:1705501007861",
+        "https://drive.usercontent.google.com/download?id=1h1GnUpyj92K7FXiHJ1xVaUYW_UYMDLPM&export=download&authuser=0&confirm=t&uuid=98de75bd-ba32-4ceb-97a7-b8d303a8dc96&at=APZUnTUewdfFIsyC3UlSlMcmmRbo:1705500978790"
+      ],
+      "dest": [
+        "Customers_New_7digit_Id_gold.xlsx",
+        "Customers_New_7digit_Id_gold.csv"
+      ],
+      "multi": true
+    },
+    "options": {
+      "as_shown": true
+    }
+  }
 }
--- a/evaluation_examples/examples/libreoffice_calc/0cecd4f3-74de-457b-ba94-29ad6b5dafb6.json
+++ b/evaluation_examples/examples/libreoffice_calc/0cecd4f3-74de-457b-ba94-29ad6b5dafb6.json
@@ -27,6 +27,31 @@
    "libreoffice_calc"
  ],
  "evaluator": {
+    "postconfig": [
+      {
+        "type": "activate_window",
+        "parameters": {
+          "window_name": "copy_sheet_insert.xlsx - LibreOffice Calc",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
+        }
+      },
+      {
+        "type": "execute",
+        "parameters": {
+          "command": [
+            "python",
+            "-c",
+            "import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+          ]
+        }
+      }
+    ],
    "func": "check_sheet_list",
    "result": {
      "type": "vm_file",
--- a/evaluation_examples/examples/libreoffice_calc/1334ca3e-f9e3-4db8-9ca7-b4c653be7d17.json
+++ b/evaluation_examples/examples/libreoffice_calc/1334ca3e-f9e3-4db8-9ca7-b4c653be7d17.json
@@ -27,6 +27,31 @@
 		"libreoffice_calc"
 	],
 	"evaluator": {
+		"postconfig": [
+			{
+				"type": "activate_window",
+				"parameters": {
+					"window_name": "Zoom_Out_Oversized_Cells.xlsx - LibreOffice Calc",
+					"strict": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"python",
+						"-c",
+						"import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+					]
+				}
+			}
+		],
 		"func": "check_xlsx_zoom",
 		"result": {
 			"type": "vm_file",
--- a/evaluation_examples/examples/libreoffice_calc/21df9241-f8d7-4509-b7f1-37e501a823f7.json
+++ b/evaluation_examples/examples/libreoffice_calc/21df9241-f8d7-4509-b7f1-37e501a823f7.json
@@ -27,21 +27,78 @@
 		"libreoffice_calc"
 	],
 	"evaluator": {
+		"postconfig": [
+			{
+				"type": "activate_window",
+				"parameters": {
+					"window_name": "Represent_in_millions_billions.xlsx - LibreOffice Calc",
+					"strict": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"python",
+						"-c",
+						"import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+					]
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"libreoffice",
+						"--convert-to",
+						"csv:Text - txt - csv (StarCalc):44,34,UTF-8,,,,false,true,true",
+						"--outdir",
+						"/home/user",
+						"/home/user/Represent_in_millions_billions.xlsx"
+					]
+				}
+			}
+		],
 		"func": "compare_table",
 		"result": {
 			"type": "vm_file",
-			"path": "/home/user/Represent_in_millions_billions.xlsx",
-			"dest": "Represent_in_millions_billions.xlsx"
+			"path": [
+				"/home/user/Represent_in_millions_billions.xlsx",
+				"/home/user/Represent_in_millions_billions.csv"
+			],
+			"dest": [
+				"Represent_in_millions_billions.xlsx",
+				"Represent_in_millions_billions.csv"
+			],
+			"multi": true
 		},
 		"expected": {
 			"type": "cloud_file",
-			"path": "https://drive.usercontent.google.com/download?id=1Jy6lZexhU5t0eW1GwXJ_csnwIe0Xiy9-&export=download&authuser=0&confirm=t&uuid=601701e7-9eb8-4ce8-83d5-35916094a15d&at=APZUnTW4WE-plIC5MmWTuFu24qLL:1703857882995",
-			"dest": "Represent_in_millions_billions_gold.xlsx"
+			"path": [
+				"https://drive.usercontent.google.com/download?id=1Jy6lZexhU5t0eW1GwXJ_csnwIe0Xiy9-&export=download&authuser=0&confirm=t&uuid=601701e7-9eb8-4ce8-83d5-35916094a15d&at=APZUnTW4WE-plIC5MmWTuFu24qLL:1703857882995",
+				"https://drive.usercontent.google.com/download?id=1CjzmJ4vqwPI7DMTR_6a8ytO-W-4xavBS&export=download&authuser=0&confirm=t&uuid=32c3430a-6d3d-47cc-bb5c-e683963b19f7&at=APZUnTWSBLNtkrZTix_BRl9gyaek:1705497493679"
+			],
+			"dest": [
+				"Represent_in_millions_billions_gold.xlsx",
+				"Represent_in_millions_billions_gold.csv"
+			],
+			"multi": true
 		},
 		"options": {
-			"features": [
-				"number_format"
-			]
+			"as_shown": true,
+			"ignore_case": true
 		}
 	}
 }
--- a/evaluation_examples/examples/libreoffice_calc/2bd59342-0664-4ccb-ba87-79379096cc08.json
+++ b/evaluation_examples/examples/libreoffice_calc/2bd59342-0664-4ccb-ba87-79379096cc08.json
@@ -26,6 +26,31 @@
    "libreoffice calc"
  ],
  "evaluator": {
+    "postconfig": [
+      {
+        "type": "activate_window",
+        "parameters": {
+          "window_name": "OrderId_Month_Chart.xlsx - LibreOffice Calc",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
+        }
+      },
+      {
+        "type": "execute",
+        "parameters": {
+          "command": [
+            "python",
+            "-c",
+            "import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+          ]
+        }
+      }
+    ],
    "func": "compare_table",
    "expected": {
      "type": "cloud_file",
--- a/evaluation_examples/examples/libreoffice_calc/347ef137-7eeb-4c80-a3bb-0951f26a8aff.json
+++ b/evaluation_examples/examples/libreoffice_calc/347ef137-7eeb-4c80-a3bb-0951f26a8aff.json
@@ -27,6 +27,31 @@
    "libreoffice_calc"
  ],
 	"evaluator": {
+    "postconfig": [
+      {
+        "type": "activate_window",
+        "parameters": {
+          "window_name": "Create_column_charts_using_statistics.xlsx - LibreOffice Calc",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
+        }
+      },
+      {
+        "type": "execute",
+        "parameters": {
+          "command": [
+            "python",
+            "-c",
+            "import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+          ]
+        }
+      }
+    ],
 		"func": "compare_table",
 		"result": {
 			"type": "vm_file",
--- a/evaluation_examples/examples/libreoffice_calc/4188d3a4-077d-46b7-9c86-23e1a036f6c1.json
+++ b/evaluation_examples/examples/libreoffice_calc/4188d3a4-077d-46b7-9c86-23e1a036f6c1.json
@@ -27,6 +27,31 @@
 		"libreoffice_calc"
 	],
 	"evaluators": {
+    "postconfig": [
+      {
+        "type": "activate_window",
+        "parameters": {
+          "window_name": "Freeze_row_column.xlsx - LibreOffice Calc",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
+        }
+      },
+      {
+        "type": "execute",
+        "parameters": {
+          "command": [
+            "python",
+            "-c",
+            "import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+          ]
+        }
+      }
+    ],
 		"func": "check_xlsx_freeze",
 		"result": {
 			"type": "vm_file",
--- a/evaluation_examples/examples/libreoffice_calc/4f07fbe9-70de-4927-a4d5-bb28bc12c52c.json
+++ b/evaluation_examples/examples/libreoffice_calc/4f07fbe9-70de-4927-a4d5-bb28bc12c52c.json
@@ -27,6 +27,31 @@
 		"libreoffice_calc"
 	],
 	"evaluator": {
+		"postconfig": [
+			{
+				"type": "activate_window",
+				"parameters": {
+					"window_name": "OrderId_Month_Chart.xlsx - LibreOffice Calc",
+					"strict": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"python",
+						"-c",
+						"import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+					]
+				}
+			}
+		],
 		"func": "compare_table",
 		"result": {
 			"type": "vm_file",
--- a/evaluation_examples/examples/libreoffice_calc/a01fbce3-2793-461f-ab86-43680ccbae25.json
+++ b/evaluation_examples/examples/libreoffice_calc/a01fbce3-2793-461f-ab86-43680ccbae25.json
@@ -1,7 +1,7 @@
 {
 	"id": "a01fbce3-2793-461f-ab86-43680ccbae25",
 	"snapshot": "libreoffice_calc",
-	"instruction": "Could you help me setting decimal separator as a dot (.)?",
+	"instruction": "I need to set the decimal separator as a comma (,) for localized data representation and clarity in visualization. Can you assist with this?",
 	"source": "https://superuser.com/questions/1250677/how-to-set-decimal-separator-in-libre-office-calc",
 	"config": [
 		{
@@ -14,6 +14,12 @@
 					}
 				]
 			}
+		},
+		{
+			"type": "open",
+			"parameters": {
+				"path": "/home/user/Set_Decimal_Separator_Dot.xlsx"
+			}
 		}
 	],
 	"trajectory": "trajectories/a01fbce3-2793-461f-ab86-43680ccbae25",
@@ -21,24 +27,77 @@
 		"libreoffice_calc"
 	],
 	"evaluator": {
-		"func": "check_libre_locale",
+		"postconfig": [
+			{
+				"type": "activate_window",
+				"parameters": {
+					"window_name": "Set_Decimal_Separator_Dot.xlsx - LibreOffice Calc",
+					"strict": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"python",
+						"-c",
+						"import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+					]
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"libreoffice",
+						"--convert-to",
+						"csv:Text - txt - csv (StarCalc):44,34,UTF-8,,,,false,true,true",
+						"--outdir",
+						"/home/user",
+						"/home/user/Set_Decimal_Separator_Dot.xlsx"
+					]
+				}
+			}
+		],
+		"func": "compare_table",
 		"result": {
 			"type": "vm_file",
-			"path": "/home/user/.config/libreoffice/4/user/registrymodifications.xcu",
-			"dest": "registrymodifications.xcu"
+			"path": [
+				"/home/user/Set_Decimal_Separator_Dot.xlsx",
+				"/home/user/Set_Decimal_Separator_Dot.csv"
+			],
+			"dest": [
+				"Set_Decimal_Separator_Dot.xlsx",
+				"Set_Decimal_Separator_Dot.csv"
+			],
+			"multi": true
 		},
 		"expected": {
-			"type": "rule",
-			"rules": {
-				"locale_set": [
-					"ru-*",
-					"de-*",
-					"fr-*",
-					"pt-*",
-					"es-*",
-					"it-*"
-				]
-			}
+			"type": "cloud_file",
+			"path": [
+				"https://drive.usercontent.google.com/download?id=15O0l5fxVi1JX_12KOLfbxWPHjXPZPon5&export=download&authuser=0&confirm=t&uuid=395e6c57-11a7-4b33-af4c-98ff2390742b&at=APZUnTVKcrUGrjRfBEwT_AD53Cmn:1705497822975",
+				"https://drive.usercontent.google.com/download?id=1rKDWcovxw4Qtd3RHs7M5p_QqryI0SQO3&export=download&authuser=0&confirm=t&uuid=eb6ffb6d-f7c2-44d8-ad77-db6c0aaf5cc7&at=APZUnTWr2VxrJPiiKVMdFd0IykrR:1705497846507"
+			],
+			"dest": [
+				"Set_Decimal_Separator_Dot_gold.xlsx",
+				"Set_Decimal_Separator_Dot_gold.csv"
+			],
+			"multi": true
+		},
+		"options": {
+			"as_shown": true
 		}
 	}
 }
--- a/evaluation_examples/examples/libreoffice_calc/a01fbce3-2793-461f-ab86-43680ccbae25.json.nosetup
+++ b/evaluation_examples/examples/libreoffice_calc/a01fbce3-2793-461f-ab86-43680ccbae25.json.nosetup
@@ -0,0 +1,85 @@
+{
+	"id": "a01fbce3-2793-461f-ab86-43680ccbae25",
+	"snapshot": "libreoffice_calc",
+	"instruction": "I need to set the decimal separator as a comma (,) for localized data representation and clarity in visualization. Can you assist with this?",
+	"source": "https://superuser.com/questions/1250677/how-to-set-decimal-separator-in-libre-office-calc",
+	"config": [],
+	"trajectory": "trajectories/a01fbce3-2793-461f-ab86-43680ccbae25",
+	"related_apps": [
+		"libreoffice_calc"
+	],
+	"evaluator": {
+		"postconfig": [
+			{
+				"type": "activate_window",
+				"parameters": {
+					"window_name": "Set_Decimal_Separator_Dot.xlsx - LibreOffice Calc",
+					"strict": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"python",
+						"-c",
+						"import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+					]
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
+				}
+			},
+			{
+				"type": "execute",
+				"parameters": {
+					"command": [
+						"libreoffice",
+						"--convert-to",
+						"csv:Text - txt - csv (StarCalc):44,34,UTF-8,,,,false,true,true",
+						"--outdir",
+						"/home/user",
+						"/home/user/Set_Decimal_Separator_Dot.xlsx"
+					]
+				}
+			}
+		],
+		"func": "compare_table",
+		"result": {
+			"type": "vm_file",
+			"path": [
+				"/home/user/Set_Decimal_Separator_Dot.xlsx",
+				"/home/user/Set_Decimal_Separator_Dot.csv"
+			],
+			"dest": [
+				"Set_Decimal_Separator_Dot.xlsx",
+				"Set_Decimal_Separator_Dot.csv"
+			],
+			"multi": true
+		},
+		"expected": {
+			"type": "cloud_file",
+			"path": [
+				"https://drive.usercontent.google.com/download?id=15O0l5fxVi1JX_12KOLfbxWPHjXPZPon5&export=download&authuser=0&confirm=t&uuid=395e6c57-11a7-4b33-af4c-98ff2390742b&at=APZUnTVKcrUGrjRfBEwT_AD53Cmn:1705497822975",
+				"https://drive.usercontent.google.com/download?id=1rKDWcovxw4Qtd3RHs7M5p_QqryI0SQO3&export=download&authuser=0&confirm=t&uuid=eb6ffb6d-f7c2-44d8-ad77-db6c0aaf5cc7&at=APZUnTWr2VxrJPiiKVMdFd0IykrR:1705497846507"
+			],
+			"dest": [
+				"Set_Decimal_Separator_Dot_gold.xlsx",
+				"Set_Decimal_Separator_Dot_gold.csv"
+			],
+			"multi": true
+		},
+		"options": {
+			"as_shown": true
+		}
+	}
+}
--- a/evaluation_examples/examples/libreoffice_calc/aa3a8974-2e85-438b-b29e-a64df44deb4b.json
+++ b/evaluation_examples/examples/libreoffice_calc/aa3a8974-2e85-438b-b29e-a64df44deb4b.json
@@ -30,8 +30,8 @@
 		"func": "check_pdf_pages",
 		"result": {
 			"type": "vm_file",
-			"path": "/home/user/Resize_Cells_Fit_Page.xlsx",
-			"dest": "Resize_Cells_Fit_Page.xlsx"
+			"path": "/home/user/Resize_Cells_Fit_Page.pdf",
+			"dest": "Resize_Cells_Fit_Page.pdf"
 		},
 		"expected": {
 			"type": "rule",
--- a/evaluation_examples/examples/libreoffice_calc/f9584479-3d0d-4c79-affa-9ad7afdd8850.json
+++ b/evaluation_examples/examples/libreoffice_calc/f9584479-3d0d-4c79-affa-9ad7afdd8850.json
@@ -27,6 +27,31 @@
 		"libreoffice calc"
 	],
 	"evaluator": {
+    "postconfig": [
+      {
+        "type": "activate_window",
+        "parameters": {
+          "window_name": "Quarterly_Product_Sales_by_Zone.xlsx - LibreOffice Calc",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
+        }
+      },
+      {
+        "type": "execute",
+        "parameters": {
+          "command": [
+            "python",
+            "-c",
+            "import pyautogui; pyautogui.press([\"ctrl\", \"s\"]);"
+          ]
+        }
+      }
+    ],
 		"func": "compare_table",
 		"expected": {
 			"type": "cloud_file",
--- a/evaluation_examples/examples/thunderbird/030eeff7-b492-4218-b312-701ec99ee0cc.json
+++ b/evaluation_examples/examples/thunderbird/030eeff7-b492-4218-b312-701ec99ee0cc.json
@@ -45,12 +45,17 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-xFc", "Mail.thunderbird"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Mail.thunderbird",
+          "strict": true,
+          "by_class": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/35253b65-1c19-4304-8aa4-6884b8218fc0.json
+++ b/evaluation_examples/examples/thunderbird/35253b65-1c19-4304-8aa4-6884b8218fc0.json
@@ -45,12 +45,16 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-Fc", "Message Filters"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Message Filters",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/3d1682a7-0fb0-49ae-a4dc-a73afd2d06d5.json
+++ b/evaluation_examples/examples/thunderbird/3d1682a7-0fb0-49ae-a4dc-a73afd2d06d5.json
@@ -45,16 +45,17 @@
 	"evaluator": {
 		"postconfig": [
 			{
-				"type": "execute",
+				"type": "close_window",
 				"parameters": {
-					"command": [
-						"wmctrl",
-						"-xFc",
-						"Mail.thunderbird"
-					],
-					"until": {
-						"returncode": 1
-					}
+					"window_name": "Mail.thunderbird",
+					"strict": true,
+					"by_class": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
 				}
 			}
 		],
--- a/evaluation_examples/examples/thunderbird/3d1682a7-0fb0-49ae-a4dc-a73afd2d06d5.json.nosetup
+++ b/evaluation_examples/examples/thunderbird/3d1682a7-0fb0-49ae-a4dc-a73afd2d06d5.json.nosetup
@@ -23,16 +23,17 @@
 	"evaluator": {
 		"postconfig": [
 			{
-				"type": "execute",
+				"type": "close_window",
 				"parameters": {
-					"command": [
-						"wmctrl",
-						"-xFc",
-						"Mail.thunderbird"
-					],
-					"until": {
-						"returncode": 1
-					}
+					"window_name": "Mail.thunderbird",
+					"strict": true,
+					"by_class": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
 				}
 			}
 		],
--- a/evaluation_examples/examples/thunderbird/480bcfea-d68f-4aaa-a0a9-2589ef319381.json
+++ b/evaluation_examples/examples/thunderbird/480bcfea-d68f-4aaa-a0a9-2589ef319381.json
@@ -45,12 +45,17 @@
 	"evaluator": {
 		"postconfig": [
 			{
-				"type": "command",
+				"type": "close_window",
 				"parameters": {
-					"command": ["wmctrl", "-xFc", "Mail.thunderbird"],
-					"until": {
-						"returncode": 1
-					}
+					"window_name": "Mail.thunderbird",
+					"strict": true,
+					"by_class": true
+				}
+			},
+			{
+				"type": "sleep",
+				"parameters": {
+					"seconds": 0.5
 				}
 			}
 		],
--- a/evaluation_examples/examples/thunderbird/6766f2b8-8a72-417f-a9e5-56fcaa735837.json
+++ b/evaluation_examples/examples/thunderbird/6766f2b8-8a72-417f-a9e5-56fcaa735837.json
@@ -45,12 +45,17 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-xFc", "Mail.thunderbird"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Mail.thunderbird",
+          "strict": true,
+          "by_class": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/6766f2b8-8a72-417f-a9e5-56fcaa735837.json.nosetup
+++ b/evaluation_examples/examples/thunderbird/6766f2b8-8a72-417f-a9e5-56fcaa735837.json.nosetup
@@ -23,12 +23,17 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-xFc", "Mail.thunderbird"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Mail.thunderbird",
+          "strict": true,
+          "by_class": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/94760984-3ff5-41ee-8347-cf1af709fea0.json
+++ b/evaluation_examples/examples/thunderbird/94760984-3ff5-41ee-8347-cf1af709fea0.json
@@ -45,12 +45,17 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-xFc", "Mail.thunderbird"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Mail.thunderbird",
+          "strict": true,
+          "by_class": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/c9e7eaf2-b1a1-4efc-a982-721972fa9f02.json
+++ b/evaluation_examples/examples/thunderbird/c9e7eaf2-b1a1-4efc-a982-721972fa9f02.json
@@ -45,12 +45,17 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-xFc", "Mail.thunderbird"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Mail.thunderbird",
+          "strict": true,
+          "by_class": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/e1e75309-3ddb-4d09-92ec-de869c928143.json
+++ b/evaluation_examples/examples/thunderbird/e1e75309-3ddb-4d09-92ec-de869c928143.json
@@ -45,12 +45,16 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-Fc", "Message Filters"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Message Filters",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],
--- a/evaluation_examples/examples/thunderbird/e1e75309-3ddb-4d09-92ec-de869c928143.json.nosetup
+++ b/evaluation_examples/examples/thunderbird/e1e75309-3ddb-4d09-92ec-de869c928143.json.nosetup
@@ -23,12 +23,16 @@
  "evaluator": {
    "postconfig": [
      {
-        "type": "command",
+        "type": "close_window",
        "parameters": {
-          "command": ["wmctrl", "-Fc", "Message Filters"],
-          "until": {
-            "returncode": 1
-          }
+          "window_name": "Message Filters",
+          "strict": true
+        }
+      },
+      {
+        "type": "sleep",
+        "parameters": {
+          "seconds": 0.5
        }
      }
    ],