From 3fc0ef57bb72869df3dc2846b28a7973e749ebf4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 10:58:06 +0200
Subject: [PATCH] [IMP] remove useless files in tests, make setup of sections
 explicit

bzr revid: xmo@openerp.com-20110331085806-j5yd1syvvos47yfj
---
 addons/base/static/src/js/base.js  | 12 +++++++++---
 addons/base/static/test/dataset.js | 24 ++++++++++++++++++------
 addons/base/static/test/test.html  |  4 ----
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index b0a2237c2b2..4833551c24e 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -74,6 +74,7 @@
         return;
     var session_counter = 0;
 
+    /** @lends openerp */
     var openerp = this.openerp =  {
         // element_ids registry linked to all controllers on the page
         // TODO rename to elements, or keep gtk naming?
@@ -82,8 +83,12 @@
         // openerp.<module> will map to
         // openerp.sessions.sessionname.<module> using a closure
         sessions: {},
-        // openerp instance constructor
-        init: function() {
+        /**
+         * OpenERP instance constructor
+         *
+         * @param {Boolean} skip_init if true, skips the built-in initialization
+         */
+        init: function(skip_init) {
             var new_instance = {
                 // links to the global openerp
                 _openerp: openerp,
@@ -98,7 +103,8 @@
                 base: {}
             };
             openerp.sessions[new_instance._session_id] = new_instance;
-            openerp.base(new_instance);
+            if (!skip_init)
+                openerp.base(new_instance);
             return new_instance;
         }
     };
diff --git a/addons/base/static/test/dataset.js b/addons/base/static/test/dataset.js
index 39c8f213fe6..6492d505f31 100644
--- a/addons/base/static/test/dataset.js
+++ b/addons/base/static/test/dataset.js
@@ -152,7 +152,9 @@ $(document).ready(function () {
     var openerp;
     module("ids_callback", {
         setup: function () {
-            openerp = window.openerp.init();
+            openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            window.openerp.base.data(openerp);
         }
     });
     asyncTest("Baseline event attributes", 6, function () {
@@ -222,7 +224,9 @@ $(document).ready(function () {
     var dataset;
     module("set", {
         setup: function () {
-            var openerp = window.openerp.init();
+            var openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            window.openerp.base.data(openerp);
             dataset = new openerp.base.DataSet();
         }
     });
@@ -245,7 +249,9 @@ $(document).ready(function () {
 
     module('ids_activation', {
         setup: function () {
-            var openerp = window.openerp.init();
+            var openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            window.openerp.base.data(openerp);
             dataset = new openerp.base.DataSet();
         }
     });
@@ -273,7 +279,9 @@ $(document).ready(function () {
 
     module('active_id_iteration', {
         setup: function () {
-            var openerp = window.openerp.init();
+            var openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            window.openerp.base.data(openerp);
             dataset = new openerp.base.DataSet();
             dataset.select([1, 2, 3]);
         }
@@ -315,7 +323,9 @@ $(document).ready(function () {
 
     module('active_ids', {
         setup: function () {
-            openerp = window.openerp.init();
+            openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            window.openerp.base.data(openerp);
         }
     });
     asyncTest('Get pre-set active_ids', 6, function () {
@@ -334,7 +344,9 @@ $(document).ready(function () {
 
     module('active_id', {
         setup: function () {
-            openerp = window.openerp.init();
+            openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            window.openerp.base.data(openerp);
         }
     });
     test('Get pre-set active_id', 3, function () {
diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html
index c354608b36a..b69b9a467a1 100644
--- a/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@ -16,10 +16,6 @@
     <script src="/base/static/src/js/base.js"></script>
     <script src="/base/static/src/js/chrome.js"></script>
     <script src="/base/static/src/js/data.js"></script>
-    <script src="/base/static/src/js/form.js"></script>
-    <script src="/base/static/src/js/list.js"></script>
-    <script src="/base/static/src/js/search.js"></script>
-    <script src="/base/static/src/js/views.js"></script>
 
 </head>
     <body id="oe" class="openerp">