tests: load required version of Clutter/Gtk early

tests/interactive/background-repeat.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

tests/interactive/background-size.js

@@ -1,10 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Cogl = imports.gi.Cogl;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
 
 function test() {
     let stage = new Clutter.Stage({ user_resizable: true, width: 1024, height: 768 });

tests/interactive/border-radius.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

tests/interactive/border-width.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

tests/interactive/borders.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

tests/interactive/box-layout.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

tests/interactive/box-shadow-animated.js

@@ -1,13 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Mainloop = imports.mainloop;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 
-const UI = imports.testcommon.ui;
-
 const DELAY = 2000;
 
 function resize_animated(label) {

tests/interactive/box-shadows.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

tests/interactive/calendar.js

@@ -1,11 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
-const UI = imports.testcommon.ui;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

tests/interactive/css-fonts.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

tests/interactive/entry.js

@@ -1,11 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
-const UI = imports.testcommon.ui;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

tests/interactive/icons.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

tests/interactive/inline-style.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

tests/interactive/scroll-view-sizing.js

@@ -1,13 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 // This is an interactive test of the sizing behavior of StScrollView. It
 // may be interesting in the future to split out the two classes at the
 // top into utility classes for testing the sizing behavior of other

tests/interactive/scrolling.js

@@ -1,11 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

tests/interactive/transitions.js

@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

tests/testcommon/ui.js

@@ -1,5 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Config = imports.misc.config;
+
+imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+imports.gi.versions.Gtk = '3.0';
+
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;