Rewrite test and redo needles for the newest iso.

needles/windows/win_setup_accept.json

@@ -1,13 +1,13 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_express_settings"
+    "win_setup_accept"
   ],
   "area": [
     {
-      "xpos": 808,
+      "xpos": 891,
-      "ypos": 661,
+      "ypos": 668,
-      "width": 83,
+      "width": 53,
       "height": 21,
       "type": "match"
     }

needles/windows/win_setup_bluenext.json

@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_next_blue"
+    "win_setup_bluenext"
   ],
   "area": [
     {
-      "xpos": 880,
+      "xpos": 896,
-      "ypos": 663,
+      "ypos": 667,
       "width": 44,
-      "height": 19,
+      "height": 23,
       "type": "match"
     }
   ]

needles/windows/win_setup_blueno.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_blueno"
+  ],
+  "area": [
+    {
+      "xpos": 713,
+      "ypos": 664,
+      "width": 50,
+      "height": 27,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_booted_logged.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_booted_logged"
+  ],
+  "area": [
+    {
+      "xpos": 838,
+      "ypos": 677,
+      "width": 185,
+      "height": 37,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_childhood_nickname.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_childhood_nickname"
+  ],
+  "area": [
+    {
+      "xpos": 389,
+      "ypos": 549,
+      "width": 101,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_custom_install.json

@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_custom_install"
+    "win_eula_custom_install"
   ],
   "area": [
     {
       "xpos": 243,
       "ypos": 323,
-      "width": 98,
+      "width": 99,
-      "height": 17,
+      "height": 16,
       "type": "match"
     }
   ]

needles/windows/win_setup_decline.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_decline"
+  ],
+  "area": [
+    {
+      "xpos": 710,
+      "ypos": 664,
+      "width": 55,
+      "height": 27,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_eula_accept.json

@@ -1,14 +1,14 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_eula_accept"
+    "win_eula_accept"
   ],
   "area": [
     {
       "xpos": 238,
-      "ypos": 499,
+      "ypos": 501,
-      "width": 64,
+      "width": 62,
-      "height": 23,
+      "height": 21,
       "type": "match"
     }
   ]

needles/windows/win_setup_install.json

@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 475,
+      "xpos": 473,
-      "ypos": 385,
+      "ypos": 383,
-      "width": 76,
+      "width": 80,
-      "height": 17,
+      "height": 21,
       "type": "match"
     }
   ]

needles/windows/win_setup_local_account.json

@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 75,
+      "xpos": 33,
-      "ypos": 304,
+      "ypos": 668,
-      "width": 36,
+      "width": 88,
-      "height": 36,
+      "height": 21,
       "type": "match"
     }
   ]

needles/windows/win_setup_logged.json

@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "win_setup_logged"
-  ],
-  "area": [
-    {
-      "xpos": 4,
-      "ypos": 732,
-      "width": 104,
-      "height": 34,
-      "type": "match"
-    }
-  ]
-}

needles/windows/win_setup_main.json

@@ -1,15 +1,15 @@
-{
+{
-  "area": [
+  "properties": [],
-    {
+  "tags": [
-      "xpos": 430,
+    "win_setup_main"
-      "ypos": 237,
+  ],
-      "width": 165,
+  "area": [
-      "height": 46,
+    {
-      "type": "match"
+      "xpos": 429,
-    }
+      "ypos": 236,
-  ],
+      "width": 170,
-  "properties": [],
+      "height": 50,
-  "tags": [
+      "type": "match"
-    "win_setup_main"
+    }
-  ]
+  ]
 }

needles/windows/win_setup_next.json

@@ -5,10 +5,10 @@
   ],
   "area": [
     {
-      "xpos": 745,
+      "xpos": 739,
-      "ypos": 545,
+      "ypos": 543,
-      "width": 53,
+      "width": 67,
-      "height": 15,
+      "height": 17,
       "type": "match"
     }
   ]

needles/windows/win_setup_oldest_cousin.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_oldest_cousin"
+  ],
+  "area": [
+    {
+      "xpos": 482,
+      "ypos": 570,
+      "width": 91,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_security_question.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_security_question"
+  ],
+  "area": [
+    {
+      "xpos": 285,
+      "ypos": 503,
+      "width": 118,
+      "height": 25,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_skip.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_skip"
+  ],
+  "area": [
+    {
+      "xpos": 894,
+      "ypos": 666,
+      "width": 45,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_yes.json

@@ -0,0 +1,15 @@
+{
+  "properties": [],
+  "tags": [
+    "win_setup_yes"
+  ],
+  "area": [
+    {
+      "xpos": 894,
+      "ypos": 666,
+      "width": 45,
+      "height": 23,
+      "type": "match"
+    }
+  ]
+}

needles/windows/win_setup_your_pet.json

@@ -1,13 +1,13 @@
 {
   "properties": [],
   "tags": [
-    "win_setup_click_user"
+    "win_setup_your_pet"
   ],
   "area": [
     {
-      "xpos": 75,
+      "xpos": 388,
-      "ypos": 315,
+      "ypos": 528,
-      "width": 75,
+      "width": 65,
       "height": 18,
       "type": "match"
     }

tests/windows_install.pm

@@ -26,29 +26,70 @@ sub run {
     # The drive 0 will always be empty, so just click Next to continue
     assert_and_click "win_setup_next", 20;
 
-    # Use Express setting to set up the installation, we do not really
+    # Confirm the region, the default US region will be ok.
-    # care about it.
+    assert_and_click "win_setup_yes", 600;
-    assert_and_click "win_setup_express_settings", 600;
+
+    # Confirm the keyboard layout, the default US keyboard will be ok.
+    assert_and_click "win_setup_yes", 60;
+
+    # Skip adding the second keyboard, we are not interested anyway.
+    assert_and_click "win_setup_skip", 60;
 
     # Join a local domain
     assert_and_click "win_setup_local_account", 600;
-    assert_and_click "win_setup_next", 20;
+    assert_and_click "win_setup_bluenext", 20;
 
-    # Fill-in account info
+    # Fill-in the account name
-    assert_and_click "win_setup_click_user", 30;
+    type_very_safely "Fedora";
-    type_very_safely "fedora";
+    assert_and_click "win_setup_bluenext", 20;
-    send_key "tab";
+
-    sleep 1;
+    # Fill-in the password
     type_very_safely "weakpassword";
-    send_key "tab";
+    assert_and_click "win_setup_bluenext", 20;
-    sleep 1;
+
+    # Confirm the password
     type_very_safely "weakpassword";
+    assert_and_click "win_setup_bluenext", 20;
+    
+    # Deal with security questions
+    # What was your first pet's name?
+    assert_and_click "win_setup_security_question", 30;
+    assert_and_click "win_setup_your_pet", 30;
+    sleep 1;
     send_key "tab";
     sleep 1;
-    type_very_safely "usual";
+    type_very_safely "Bob";
+    assert_and_click "win_setup_bluenext", 30;
+
+    # What was your childhood nickname?
+    assert_and_click "win_setup_security_question", 30;
+    assert_and_click "win_setup_childhood_nickname", 30;
+    sleep 1;
+    send_key "tab";
+    sleep 1;
+    type_very_safely "Bob";
+    assert_and_click "win_setup_bluenext", 30;
+
+    # What was the name of your oldest cousin?
+    assert_and_click "win_setup_security_question", 30;
+    assert_and_click "win_setup_oldest_cousin", 30;
+    sleep 1;
+    send_key "tab";
+    sleep 1;
+    type_very_safely "Bob";
+    assert_and_click "win_setup_bluenext", 30;
+
+    # Refuse the activity history.
+    assert_and_click "win_setup_blueno", 30;
+
+    # Refuse digital assistant
+    assert_and_click "win_setup_decline", 30;
+
+    # Accept suggested values (bad but fast and easy)
+    assert_and_click "win_setup_accept", 30;
 
     # Check if booted
-    assert_screen "win_setup_logged", 600;
+    assert_screen "win_setup_booted_logged", 600;
     
 }