Merge r221416 - Unreviewed. Fix GTK+ test /webkit2/WebKitAutomationSe…

…ssion/request-session.

It fails when comparing the browser version if micro version is 0 (or if both micro and minor are 0 too).

* TestWebKitAPI/Tests/WebKitGLib/TestAutomationSession.cpp: Use a helper method to convert major, minor, micro
numbers into a version string, using the same approach as WebKitAutomationSession.

Tools/ChangeLog

@@ -1,3 +1,12 @@
+2017-08-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK+ test /webkit2/WebKitAutomationSession/request-session.
+
+        It fails when comparing the browser version if micro version is 0 (or if both micro and minor are 0 too).
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestAutomationSession.cpp: Use a helper method to convert major, minor, micro
+        numbers into a version string, using the same approach as WebKitAutomationSession.
+
 2017-08-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. REGRESSION(r221219): Fix unit tests using resources from WebKit directory.

Tools/TestWebKitAPI/Tests/WebKitGLib/TestAutomationSession.cpp

@@ -193,6 +193,17 @@ class AutomationTest: public Test {
         test->automationStarted(session);
     }
 
+    static GUniquePtr<char> toVersionString(unsigned major, unsigned minor, unsigned micro)
+    {
+        if (!micro && !minor)
+            return GUniquePtr<char>(g_strdup_printf("%u", major));
+
+        if (!micro)
+            return GUniquePtr<char>(g_strdup_printf("%u.%u", major, minor));
+
+        return GUniquePtr<char>(g_strdup_printf("%u.%u.%u", major, minor, micro));
+    }
+
     WebKitAutomationSession* requestSession(const char* sessionID)
     {
         auto signalID = g_signal_connect(m_webContext.get(), "automation-started", G_CALLBACK(automationStartedCallback), this);
@@ -209,7 +220,7 @@ class AutomationTest: public Test {
                 const char* browserVersion;
                 g_variant_get(capabilities.get(), "(&s&s)", &browserName, &browserVersion);
                 g_assert_cmpstr(browserName, ==, "AutomationTestBrowser");
-                GUniquePtr<char> versionString(g_strdup_printf("%u.%u.%u", WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION));
+                GUniquePtr<char> versionString = toVersionString(WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION);
                 g_assert_cmpstr(browserVersion, ==, versionString.get());
             }, this
         );