Revert "Bug 841422 - Move unit tests for shared code out of gallery r…

…=lightsofapollo" This reverts commit 09411b0.
mozilla-b2g · May 6, 2014 · d902ffe · d902ffe
1 parent b503736
commit d902ffe
Show file tree

Hide file tree

Showing 47 changed files with 65 additions and 70 deletions.
diff --git a/.jshintignore b/.jshintignore
@@ -20,7 +20,7 @@ apps/keyboard/js/imes/jspinyin/libpinyin.js
 apps/keyboard/js/imes/jszhuyin/lib/**
 shared/js/setImmediate.js
 shared/test/unit/test-agent-server.js
-apps/sharedtest/test/unit/setImmediate_test.js
+apps/gallery/test/unit/setImmediate_test.js
 apps/wappush/js/ext/**
 apps/keyboard/js/imes/jsavrophonetic/jsavrophonetic.js
 apps/camera/js/vendor/alameda.js

diff --git a/...haredtest/test/unit/DeviceStorage_test.js → apps/gallery/test/unit/DeviceStorage_test.js b/...haredtest/test/unit/DeviceStorage_test.js → apps/gallery/test/unit/DeviceStorage_test.js
diff --git a/...redtest/test/unit/GestureDetector_test.js → ...gallery/test/unit/GestureDetector_test.js b/...redtest/test/unit/GestureDetector_test.js → ...gallery/test/unit/GestureDetector_test.js
diff --git a/...sharedtest/test/unit/asyncStorage_test.js → apps/gallery/test/unit/asyncStorage_test.js b/...sharedtest/test/unit/asyncStorage_test.js → apps/gallery/test/unit/asyncStorage_test.js
diff --git a/apps/sharedtest/test/unit/format_test.js → apps/gallery/test/unit/format_test.js b/apps/sharedtest/test/unit/format_test.js → apps/gallery/test/unit/format_test.js
@@ -1,3 +1,8 @@
+/**
+ * Tests for the shared formatters
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
 require('/shared/js/format.js');
 
 suite('format', function() {

diff --git a/...sharedtest/test/unit/input_parser_test.js → apps/gallery/test/unit/input_parser_test.js b/...sharedtest/test/unit/input_parser_test.js → apps/gallery/test/unit/input_parser_test.js
diff --git a/...aredtest/test/unit/l10n/l10n_date_test.js → .../gallery/test/unit/l10n/l10n_date_test.js b/...aredtest/test/unit/l10n/l10n_date_test.js → .../gallery/test/unit/l10n/l10n_date_test.js
@@ -1,5 +1,10 @@
 'use strict';
 
+/**
+ * Tests for the shared l10n date code
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
 require('/shared/js/l10n.js');
 require('/shared/js/l10n_date.js');
 //mocha.setup({globals: ['jsCount', 'totalResult']});

diff --git a/apps/sharedtest/test/unit/l10n/l10n_test.js → apps/gallery/test/unit/l10n/l10n_test.js b/apps/sharedtest/test/unit/l10n/l10n_test.js → apps/gallery/test/unit/l10n/l10n_test.js
@@ -1,3 +1,9 @@
+/**
+ * Tests for the shared l10n date code
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
+
 suite('L10n', function() {
   var _;
   var _translate;

diff --git a/...unit/l10n/lib/compiler/attributes_test.js → ...unit/l10n/lib/compiler/attributes_test.js b/...unit/l10n/lib/compiler/attributes_test.js → ...unit/l10n/lib/compiler/attributes_test.js
diff --git a/...st/unit/l10n/lib/compiler/ctxdata_test.js → ...st/unit/l10n/lib/compiler/ctxdata_test.js b/...st/unit/l10n/lib/compiler/ctxdata_test.js → ...st/unit/l10n/lib/compiler/ctxdata_test.js
diff --git a/...t/test/unit/l10n/lib/compiler/dos_test.js → ...y/test/unit/l10n/lib/compiler/dos_test.js b/...t/test/unit/l10n/lib/compiler/dos_test.js → ...y/test/unit/l10n/lib/compiler/dos_test.js
diff --git a/...t/test/unit/l10n/lib/compiler/env_test.js → ...y/test/unit/l10n/lib/compiler/env_test.js b/...t/test/unit/l10n/lib/compiler/env_test.js → ...y/test/unit/l10n/lib/compiler/env_test.js
diff --git a/...est/unit/l10n/lib/compiler/errors_test.js → ...est/unit/l10n/lib/compiler/errors_test.js b/...est/unit/l10n/lib/compiler/errors_test.js → ...est/unit/l10n/lib/compiler/errors_test.js
diff --git a/...st/unit/l10n/lib/compiler/indexes_test.js → ...st/unit/l10n/lib/compiler/indexes_test.js b/...st/unit/l10n/lib/compiler/indexes_test.js → ...st/unit/l10n/lib/compiler/indexes_test.js
diff --git a/...est/unit/l10n/lib/compiler/macros_test.js → ...est/unit/l10n/lib/compiler/macros_test.js b/...est/unit/l10n/lib/compiler/macros_test.js → ...est/unit/l10n/lib/compiler/macros_test.js
diff --git a/...unit/l10n/lib/compiler/primitives_test.js → ...unit/l10n/lib/compiler/primitives_test.js b/...unit/l10n/lib/compiler/primitives_test.js → ...unit/l10n/lib/compiler/primitives_test.js
diff --git a/.../test/unit/l10n/lib/context/basic_test.js → .../test/unit/l10n/lib/context/basic_test.js b/.../test/unit/l10n/lib/context/basic_test.js → .../test/unit/l10n/lib/context/basic_test.js
@@ -18,7 +18,7 @@ if (typeof navigator !== 'undefined') {
 }
 
 if (typeof navigator !== 'undefined') {
-  var path = 'http://sharedtest.gaiamobile.org:8080/test/unit/l10n/lib/context';
+  var path = 'http://gallery.gaiamobile.org:8080/test/unit/l10n/lib/context';
 } else {
   var path = __dirname;
 }

diff --git a/...st/unit/l10n/lib/context/fallback_test.js → ...st/unit/l10n/lib/context/fallback_test.js b/...st/unit/l10n/lib/context/fallback_test.js → ...st/unit/l10n/lib/context/fallback_test.js
@@ -7,7 +7,7 @@ var assert = require('assert') || window.assert;
 if (typeof navigator !== 'undefined') {
   var L10n = navigator.mozL10n._getInternalAPI();
   var Context = L10n.Context;
-  var path = 'http://sharedtest.gaiamobile.org:8080/test/unit/l10n/lib/context';
+  var path = 'http://gallery.gaiamobile.org:8080/test/unit/l10n/lib/context';
 } else {
   var Context = process.env.L20N_COV ?
     require('../../../build/cov/lib/l20n/context').Context

diff --git a/...10n/lib/context/fixtures/basic.properties → ...10n/lib/context/fixtures/basic.properties b/...10n/lib/context/fixtures/basic.properties → ...10n/lib/context/fixtures/basic.properties
diff --git a/...10n/lib/context/fixtures/en-US.properties → ...10n/lib/context/fixtures/en-US.properties b/...10n/lib/context/fixtures/en-US.properties → ...10n/lib/context/fixtures/en-US.properties
diff --git a/...t/l10n/lib/context/fixtures/pl.properties → ...t/l10n/lib/context/fixtures/pl.properties b/...t/l10n/lib/context/fixtures/pl.properties → ...t/l10n/lib/context/fixtures/pl.properties
diff --git a/...st/unit/l10n/lib/context/langnego_test.js → ...st/unit/l10n/lib/context/langnego_test.js b/...st/unit/l10n/lib/context/langnego_test.js → ...st/unit/l10n/lib/context/langnego_test.js
diff --git a/...est/unit/l10n/lib/context/loading_test.js → ...est/unit/l10n/lib/context/loading_test.js b/...est/unit/l10n/lib/context/loading_test.js → ...est/unit/l10n/lib/context/loading_test.js
@@ -7,7 +7,7 @@ var assert = require('assert') || window.assert;
 if (typeof navigator !== 'undefined') {
   var L10n = navigator.mozL10n._getInternalAPI();
   var Context = L10n.Context;
-  var path = 'http://sharedtest.gaiamobile.org:8080/test/unit/l10n/lib/context';
+  var path = 'http://gallery.gaiamobile.org:8080/test/unit/l10n/lib/context';
 } else {
   var Context = process.env.L20N_COV ?
     require('../../../build/cov/lib/l20n/context').Context

diff --git a/...t/unit/l10n/lib/context/resources_test.js → ...t/unit/l10n/lib/context/resources_test.js b/...t/unit/l10n/lib/context/resources_test.js → ...t/unit/l10n/lib/context/resources_test.js
@@ -7,7 +7,7 @@ var assert = require('assert') || window.assert;
 if (typeof navigator !== 'undefined') {
   var L10n = navigator.mozL10n._getInternalAPI();
   var Context = L10n.Context;
-  var path = 'http://sharedtest.gaiamobile.org:8080/test/unit/l10n/context';
+  var path = 'http://gallery.gaiamobile.org:8080/test/unit/l10n/context';
 } else {
   var Context = process.env.L20N_COV ?
     require('../../../build/cov/lib/l20n/context').Context

diff --git a/...it/l10n/lib/context/retranslation_test.js → ...it/l10n/lib/context/retranslation_test.js b/...it/l10n/lib/context/retranslation_test.js → ...it/l10n/lib/context/retranslation_test.js
diff --git a/...redtest/test/unit/l10n/lib/parser_test.js → ...gallery/test/unit/l10n/lib/parser_test.js b/...redtest/test/unit/l10n/lib/parser_test.js → ...gallery/test/unit/l10n/lib/parser_test.js
diff --git a/.../sharedtest/test/unit/lazy_loader_test.js → apps/gallery/test/unit/lazy_loader_test.js b/.../sharedtest/test/unit/lazy_loader_test.js → apps/gallery/test/unit/lazy_loader_test.js
@@ -1,3 +1,8 @@
+/**
+ * Tests for the shared lazy loader code
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
 require('/shared/js/lazy_loader.js');
 require('/shared/js/html_imports.js');
 

diff --git a/apps/sharedtest/test/unit/mediadb_test.js → apps/gallery/test/unit/mediadb_test.js b/apps/sharedtest/test/unit/mediadb_test.js → apps/gallery/test/unit/mediadb_test.js
diff --git a/.../sharedtest/test/unit/mime_mapper_test.js → apps/gallery/test/unit/mime_mapper_test.js b/.../sharedtest/test/unit/mime_mapper_test.js → apps/gallery/test/unit/mime_mapper_test.js
@@ -1,4 +1,6 @@
 'use strict';
+// We might need to modify the build script to run the shared lib
+// right under the shared folder in the future(bug 841422).
 require('/shared/js/mime_mapper.js');
 
 suite('Shared library mime_mapper api tests', function() {

diff --git a/...redtest/test/unit/scroll_detector_test.js → ...gallery/test/unit/scroll_detector_test.js b/...redtest/test/unit/scroll_detector_test.js → ...gallery/test/unit/scroll_detector_test.js
@@ -1,3 +1,9 @@
+/**
+ * Tests for the shared scroll detector helper
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
+
 'use strict';
 
 require('/shared/js/scroll_detector.js');

diff --git a/...sharedtest/test/unit/setImmediate_test.js → apps/gallery/test/unit/setImmediate_test.js b/...sharedtest/test/unit/setImmediate_test.js → apps/gallery/test/unit/setImmediate_test.js
diff --git a/...aredtest/test/unit/setImmediate_worker.js → .../gallery/test/unit/setImmediate_worker.js b/...aredtest/test/unit/setImmediate_worker.js → .../gallery/test/unit/setImmediate_worker.js
diff --git a/...sharedtest/test/unit/settings_url_test.js → apps/gallery/test/unit/settings_url_test.js b/...sharedtest/test/unit/settings_url_test.js → apps/gallery/test/unit/settings_url_test.js
@@ -1,3 +1,8 @@
+/**
+ * Tests for the shared settings url code
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
 require('/shared/js/settings_url.js');
 
 suite('SettingsURL', function() {

diff --git a/apps/sharedtest/test/unit/setup.js → apps/gallery/test/unit/setup.js b/apps/sharedtest/test/unit/setup.js → apps/gallery/test/unit/setup.js
diff --git a/...redtest/test/unit/sticky_header_test.html → ...gallery/test/unit/sticky_header_test.html b/...redtest/test/unit/sticky_header_test.html → ...gallery/test/unit/sticky_header_test.html
diff --git a/...haredtest/test/unit/sticky_header_test.js → apps/gallery/test/unit/sticky_header_test.js b/...haredtest/test/unit/sticky_header_test.js → apps/gallery/test/unit/sticky_header_test.js
@@ -1,3 +1,9 @@
+/**
+ * Tests for the shared scroll detector helper
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
+
 'use strict';
 
 /* global loadBodyHTML, StickyHeader */

diff --git a/...haredtest/test/unit/support/elements.html → apps/gallery/test/unit/support/elements.html b/...haredtest/test/unit/support/elements.html → apps/gallery/test/unit/support/elements.html
diff --git a/apps/sharedtest/test/unit/support/inc.js → apps/gallery/test/unit/support/inc.js b/apps/sharedtest/test/unit/support/inc.js → apps/gallery/test/unit/support/inc.js
diff --git a/...sharedtest/test/unit/support/long_load.js → apps/gallery/test/unit/support/long_load.js b/...sharedtest/test/unit/support/long_load.js → apps/gallery/test/unit/support/long_load.js
diff --git a/apps/sharedtest/test/unit/support/styles.css → apps/gallery/test/unit/support/styles.css b/apps/sharedtest/test/unit/support/styles.css → apps/gallery/test/unit/support/styles.css
diff --git a/.../test/unit/tag_visibility_monitor_test.js → .../test/unit/tag_visibility_monitor_test.js b/.../test/unit/tag_visibility_monitor_test.js → .../test/unit/tag_visibility_monitor_test.js
diff --git a/apps/sharedtest/test/unit/url_helper_test.js → apps/gallery/test/unit/url_helper_test.js b/apps/sharedtest/test/unit/url_helper_test.js → apps/gallery/test/unit/url_helper_test.js
@@ -1,3 +1,8 @@
+/**
+ * Tests for the shared url helpercode
+ * TODO: Shared code unit tests should not be in gallery
+ * Bug #841422 has been filed to move these tests
+ */
 require('/shared/js/url_helper.js');
 
 suite('URL Helper', function() {

diff --git a/apps/sharedtest/index.html b/apps/sharedtest/index.html
diff --git a/apps/sharedtest/manifest.webapp b/apps/sharedtest/manifest.webapp
diff --git a/apps/sharedtest/style/icons/Blank.png b/apps/sharedtest/style/icons/Blank.png
diff --git a/apps/sharedtest/test/unit/.jshintrc b/apps/sharedtest/test/unit/.jshintrc
diff --git a/build/jshint/xfail.list b/build/jshint/xfail.list
@@ -195,9 +195,24 @@ apps/gallery/test/marionette/delete_image_test.js
 apps/gallery/test/marionette/edit_image_test.js
 apps/gallery/test/marionette/fullscreen_image_test.js
 apps/gallery/test/marionette/lib/gallery.js
+apps/gallery/test/unit/DeviceStorage_test.js
+apps/gallery/test/unit/GestureDetector_test.js
+apps/gallery/test/unit/asyncStorage_test.js
+apps/gallery/test/unit/format_test.js
+apps/gallery/test/unit/input_parser_test.js
+apps/gallery/test/unit/l10n/l10n_test.js
+apps/gallery/test/unit/lazy_loader_test.js
+apps/gallery/test/unit/mediadb_test.js
+apps/gallery/test/unit/mime_mapper_test.js
 apps/gallery/test/unit/mock_thumbnail_group.js
+apps/gallery/test/unit/setImmediate_worker.js
+apps/gallery/test/unit/settings_url_test.js
+apps/gallery/test/unit/setup.js
+apps/gallery/test/unit/support/long_load.js
+apps/gallery/test/unit/tag_visibility_monitor_test.js
 apps/gallery/test/unit/thumbnail_item_test.js
 apps/gallery/test/unit/thumbnail_list_test.js
+apps/gallery/test/unit/url_helper_test.js
 apps/homescreen/everything.me/config/config.js
 apps/homescreen/everything.me/js/Brain.js
 apps/homescreen/everything.me/js/Core.js
@@ -374,21 +389,6 @@ apps/settings/test/unit/sim_settings_helper_test.js
 apps/settings/test/unit/simcard_lock_test.js
 apps/settings/test/unit/toaster_test.js
 apps/settings/test/unit/wifi_helper_test.js
-apps/sharedtest/test/unit/DeviceStorage_test.js
-apps/sharedtest/test/unit/GestureDetector_test.js
-apps/sharedtest/test/unit/asyncStorage_test.js
-apps/sharedtest/test/unit/format_test.js
-apps/sharedtest/test/unit/input_parser_test.js
-apps/sharedtest/test/unit/l10n/l10n_test.js
-apps/sharedtest/test/unit/lazy_loader_test.js
-apps/sharedtest/test/unit/mediadb_test.js
-apps/sharedtest/test/unit/mime_mapper_test.js
-apps/sharedtest/test/unit/setImmediate_worker.js
-apps/sharedtest/test/unit/settings_url_test.js
-apps/sharedtest/test/unit/setup.js
-apps/sharedtest/test/unit/support/long_load.js
-apps/sharedtest/test/unit/tag_visibility_monitor_test.js
-apps/sharedtest/test/unit/url_helper_test.js
 apps/system/js/accessibility.js
 apps/system/js/airplane_mode.js
 apps/system/js/app_install_manager.js