- unshift instead of replacement of INC array

canonic-epicure · Jul 2, 2010 · c698422 · c698422
1 parent e0f93e9
commit c698422
Show file tree

Hide file tree

Showing 24 changed files with 57 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.build
 .project
 .externalToolBuilders
 /JooseX-Namespace-Depended-*
diff --git a/t/005_resources_manager.t.js b/t/005_resources_manager.t.js
@@ -11,13 +11,15 @@ StartTest(function(t) {
     t.ok(JooseX.Namespace.Depended.Resource.JooseClass, 'JooseX.Namespace.Depended.Resource.JooseClass is here')
     t.ok(JooseX.Namespace.Depended.Resource.NonJoose, 'JooseX.Namespace.Depended.Resource.NonJoose is here')
 
-    t.ok(JooseX.Namespace.Depended.Locator.URL, 'JooseX.Namespace.Depended.Locator.URL is here')
-    t.ok(JooseX.Namespace.Depended.Resource.ExternalURL, 'JooseX.Namespace.Depended.Resource.ExternalURL is here')
-    t.ok(JooseX.Namespace.Depended.Resource.InternalURL, 'JooseX.Namespace.Depended.Resource.InternalURL is here')
-
-
-    t.ok(JooseX.Namespace.Depended.Transport.XHRAsync, 'JooseX.Namespace.Depended.Transport.XHRAsync is here')
-    t.ok(JooseX.Namespace.Depended.Transport.ScriptTag, 'JooseX.Namespace.Depended.Transport.ScriptTag is here')
+    t.skip(Joose.is_NodeJS, "Not included in NodeJS bundle", function (){
+
+        t.ok(JooseX.Namespace.Depended.Locator.URL, 'JooseX.Namespace.Depended.Locator.URL is here')
+        t.ok(JooseX.Namespace.Depended.Resource.ExternalURL, 'JooseX.Namespace.Depended.Resource.ExternalURL is here')
+        t.ok(JooseX.Namespace.Depended.Resource.InternalURL, 'JooseX.Namespace.Depended.Resource.InternalURL is here')
+
+        t.ok(JooseX.Namespace.Depended.Transport.XHRAsync, 'JooseX.Namespace.Depended.Transport.XHRAsync is here')
+        t.ok(JooseX.Namespace.Depended.Transport.ScriptTag, 'JooseX.Namespace.Depended.Transport.ScriptTag is here')
+    }, 5)
 
     t.ok(JooseX.Namespace.Depended.Materialize.Eval, 'JooseX.Namespace.Depended.Materialize.Eval is here')
 

diff --git a/t/010_basic.t.js b/t/010_basic.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 
@@ -84,10 +84,10 @@ StartTest(function(t) {
     })
 
 
-    //==================================================================================================================================================================================
-    t.diag("Loading from external url")
-
-//    t.skip(Joose.is_NodeJS, "XHR requests won't work in Node", function (){
+    t.skip(Joose.is_NodeJS, "XHR requests won't work in Node", function (){
+        
+        //==================================================================================================================================================================================
+        t.diag("Loading from external url")
 
         var async3 = t.beginAsync()
         var bodyCalled = false
@@ -124,23 +124,21 @@ StartTest(function(t) {
         t.ok(!ExtCoreLoader.meta.resource.loading, 'GMapLoader module is considered not loading')
         t.ok(!ExtCoreLoader.meta.resource.ready, 'GMapLoader module is not ready yet')
 
-//    }, 7)
-
-
-    //==================================================================================================================================================================================
-    //t.diag("Checking repeating calls to BEGIN")
-
-    var async31 = t.beginAsync()
-
-    use('ExtCoreLoader', function () {
         //==================================================================================================================================================================================
-        t.diag("Checking repeating calls to BEGIN")
+        //t.diag("Checking repeating calls to BEGIN")
 
-        t.ok(beginCount == 1, "Begin was called only once #2")
+        var async31 = t.beginAsync()
 
-        t.endAsync(async31)
-    })
+        use('ExtCoreLoader', function () {
+            //==================================================================================================================================================================================
+            t.diag("Checking repeating calls to BEGIN")
+
+            t.ok(beginCount == 1, "Begin was called only once #2")
+
+            t.endAsync(async31)
+        })
 
+    }, 8)
 
 
     //==================================================================================================================================================================================

diff --git a/t/011_basic_own_url.t.js b/t/011_basic_own_url.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/012_basic_begin.t.js b/t/012_basic_begin.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/015_basic_for_roles.t.js b/t/015_basic_for_roles.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/016_external_preloaded_js.t.js b/t/016_external_preloaded_js.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/017_use_in_anonymous.t.js b/t/017_use_in_anonymous.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/018_dependency_in_meta.t.js b/t/018_dependency_in_meta.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/019_synchronous_class_creation.t.js b/t/019_synchronous_class_creation.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/020_stressed.t.js b/t/020_stressed.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/030_versioning.t.js b/t/030_versioning.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/040_dependencies_besides_use.t.js b/t/040_dependencies_besides_use.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/050_own_namespace_deps.t.js b/t/050_own_namespace_deps.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/060_asynchronous_nesting.t.js b/t/060_asynchronous_nesting.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/070_dependencies_in_my.t.js b/t/070_dependencies_in_my.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2', 'localLib/root3' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2', 'localLib/root3')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/080_dependencies_in_lazy_classes.t.js b/t/080_dependencies_in_lazy_classes.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/081_dependencies_in_lazy_classes.t.js b/t/081_dependencies_in_lazy_classes.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2', '/inc' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2', '/inc')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/082_dependencies_from_previous_namespace.t.js b/t/082_dependencies_from_previous_namespace.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root3/lib' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root3/lib')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/090_future_class.t.js b/t/090_future_class.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2', '/inc' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2', '/inc')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/100_additional_resources.t.js b/t/100_additional_resources.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root1', 'localLib/root2' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root1', 'localLib/root2')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/110_several_classes_in_file.t.js b/t/110_several_classes_in_file.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root4' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root4')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/120_script_tag_transport.t.js b/t/120_script_tag_transport.t.js
@@ -1,6 +1,6 @@
 StartTest(function(t) {
 
-    JooseX.Namespace.Depended.Manager.my.INC = [ 'localLib/root4' ]
+    JooseX.Namespace.Depended.Manager.my.INC.unshift('localLib/root4')
 
     if (!Joose.is_NodeJS) t.harness.localizeINC(JooseX.Namespace.Depended.Manager.my.INC)
 

diff --git a/t/index.js b/t/index.js
@@ -9,9 +9,18 @@ if (typeof process != 'undefined' && process.pid) {
 
 
 Harness.my.configure({
-    title   : 'JooseX.Namespace.Depended test suite',
+    title       : 'JooseX.Namespace.Depended test suite',
 
-    preload : [
+    verbosity   : 1,
+    runCore     : 'sequential',
+
+    preload     : Joose.is_NodeJS ? [
+
+        'jsan:Task.Joose.Core',
+
+        'Task.JooseX.Namespace.Depended.NodeJS'
+
+    ] : [
         'jsan:Task.Joose.Core',
         'jsan:JooseX.SimpleRequest',
         'jsan:JooseX.Meta.Lazy',