mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 21:31:04 +00:00
Merge f-t to m-c
This commit is contained in:
Phil Ringnalda
commit
c1d89249f6
@ -540,16 +540,6 @@ HistogramView.prototype = {
|
||||
}
|
||||
var roundedHeight = Math.round(step.value * height);
|
||||
ctx.fillRect(step.x, height - roundedHeight, step.width, roundedHeight);
|
||||
if (step.marker) {
|
||||
var x = step.x + step.width + 2;
|
||||
var endPoint = x + ctx.measureText(step.marker).width;
|
||||
var lastDataPoint = this._histogramData[this._histogramData.length-1];
|
||||
if (endPoint >= lastDataPoint.x + lastDataPoint.width) {
|
||||
x -= endPoint - (lastDataPoint.x + lastDataPoint.width) - 1;
|
||||
}
|
||||
ctx.fillText(step.marker, x, 15 + ((markerCount % 2) == 0 ? 0 : 20));
|
||||
markerCount++;
|
||||
}
|
||||
}
|
||||
|
||||
this._finishedRendering = true;
|
||||
|
||||
@ -687,7 +687,7 @@ arrowbox {
|
||||
|
||||
.meta-section > richgrid {
|
||||
opacity: 1;
|
||||
transform: translateX(0) scale(1);
|
||||
transform: translateX(0) translateY(0);
|
||||
transition-duration: 367ms;
|
||||
transition-delay: 500ms;
|
||||
transition-timing-function: @metro_animation_easing@;
|
||||
@ -705,7 +705,7 @@ arrowbox {
|
||||
|
||||
.meta-section > richgrid[fade] {
|
||||
opacity: 0;
|
||||
transform: translateX(150px) scale(.9);
|
||||
transform: translateX(150px) translateY(25px);
|
||||
}
|
||||
|
||||
#start-container[viewstate="snapped"] .meta-section > richgrid {
|
||||
|
||||
@ -15,4 +15,4 @@ skip = false
|
||||
smoketest = false
|
||||
|
||||
; AUS tests
|
||||
[include:../../../../../toolkit/mozapps/update/test/marionette/update-tests.ini]
|
||||
[include:../../../../../toolkit/mozapps/update/tests/marionette/update-tests.ini]
|
||||
|
||||
@ -9,9 +9,8 @@
|
||||
[include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
|
||||
[include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
|
||||
[include:toolkit/mozapps/downloads/tests/unit/xpcshell.ini]
|
||||
[include:toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini]
|
||||
[include:toolkit/mozapps/update/test_svc/unit/xpcshell.ini]
|
||||
[include:toolkit/mozapps/update/test/unit/xpcshell.ini]
|
||||
[include:toolkit/mozapps/shared/test/unit/xpcshell.ini]
|
||||
[include:toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini]
|
||||
[include:toolkit/mozapps/update/test/unit_base_updater/xpcshell.ini]
|
||||
[include:toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini]
|
||||
[include:ipc/testshell/tests/xpcshell.ini]
|
||||
[include:b2g/components/test/unit/xpcshell.ini]
|
||||
|
||||
@ -14,36 +14,30 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
|
||||
# which the maintenance service uses.
|
||||
DIRS += ['common']
|
||||
|
||||
TEST_DIRS += ['test_timermanager']
|
||||
MODULE = 'update'
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += ['tests/unit_timermanager/xpcshell.ini']
|
||||
|
||||
XPIDL_SOURCES += [
|
||||
'nsIUpdateTimerManager.idl',
|
||||
]
|
||||
|
||||
# Update tests require the updater binary
|
||||
if CONFIG['MOZ_UPDATER']:
|
||||
TEST_DIRS += ['test']
|
||||
|
||||
if CONFIG['MOZ_MAINTENANCE_SERVICE']:
|
||||
TEST_DIRS += ['test_svc']
|
||||
|
||||
XPIDL_SOURCES += [
|
||||
'nsIUpdateService.idl',
|
||||
]
|
||||
|
||||
MODULE = 'update'
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'nsUpdateTimerManager.js',
|
||||
'nsUpdateTimerManager.manifest',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_UPDATER']:
|
||||
TEST_DIRS += ['tests']
|
||||
|
||||
XPIDL_SOURCES += [
|
||||
'nsIUpdateService.idl',
|
||||
]
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'nsUpdateService.manifest',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_UPDATER']:
|
||||
EXTRA_PP_COMPONENTS += [
|
||||
'nsUpdateService.js',
|
||||
'nsUpdateServiceStub.js',
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
TESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
|
||||
|
||||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
|
||||
-DBIN_SUFFIX=$(BIN_SUFFIX) \
|
||||
-DNS_NO_XPCOM \
|
||||
-DMOZ_DEBUG=$(MOZ_DEBUG) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MAINTENANCE_SERVICE
|
||||
DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE)
|
||||
endif
|
||||
|
||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
INI_TEST_FILES = \
|
||||
TestAUSReadStrings1.ini \
|
||||
TestAUSReadStrings2.ini \
|
||||
TestAUSReadStrings3.ini \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir) \
|
||||
-I$(topsrcdir)/toolkit/mozapps/update \
|
||||
-I$(topsrcdir)/toolkit/mozapps/update/common \
|
||||
$(NULL)
|
||||
|
||||
MOZ_WINCONSOLE = 1
|
||||
|
||||
LIBS += \
|
||||
../common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
DEFINES += -DUNICODE -D_UNICODE
|
||||
endif
|
||||
endif # Not Android
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
# TestAUSReadStrings runs during check in the following directory with a Unicode
|
||||
# char in order to test bug 473417 on Windows.
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
bug473417dir = test_bug473417-ó
|
||||
else
|
||||
bug473417dir = test_bug473417
|
||||
endif
|
||||
|
||||
check::
|
||||
$(RM) -rf $(DEPTH)/_tests/updater/ && $(NSINSTALL) -D $(DEPTH)/_tests/updater/$(bug473417dir)/
|
||||
for i in $(INI_TEST_FILES); do \
|
||||
$(INSTALL) $(srcdir)/$$i $(DEPTH)/_tests/updater/$(bug473417dir)/; \
|
||||
done
|
||||
$(INSTALL) $(FINAL_TARGET)/TestAUSReadStrings$(BIN_SUFFIX) $(DEPTH)/_tests/updater/$(bug473417dir)/
|
||||
@$(RUN_TEST_PROGRAM) $(DEPTH)/_tests/updater/$(bug473417dir)/TestAUSReadStrings$(BIN_SUFFIX)
|
||||
endif # Not Android
|
||||
|
||||
libs:: unit/head_update.js.in
|
||||
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $^ > $(TESTROOT)/unit/head_update.js
|
||||
|
||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
libs::
|
||||
$(INSTALL) TestAUSHelper$(BIN_SUFFIX) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
|
||||
endif
|
||||
endif
|
||||
@ -1,16 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
MOCHITEST_CHROME_FILES := \
|
||||
../unit/data/simple.mar \
|
||||
../unit/data/simple_no_pib.mar \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs::
|
||||
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(srcdir)/utils.js > \
|
||||
$(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/utils.js
|
||||
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(srcdir)/update.sjs > \
|
||||
$(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/update.sjs
|
||||
@ -1,8 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
[DEFAULT]
|
||||
head = head_update.js
|
||||
tail =
|
||||
generated-files = head_update.js
|
||||
support-files =
|
||||
data/**
|
||||
xpcshell_updater.ini
|
||||
|
||||
[test_0010_general.js]
|
||||
[test_0020_general.js]
|
||||
[test_0030_general.js]
|
||||
[test_0040_general.js]
|
||||
[test_0050_general.js]
|
||||
[test_0060_manager.js]
|
||||
[test_0061_manager.js]
|
||||
[test_0062_manager.js]
|
||||
[test_0063_manager.js]
|
||||
[test_0064_manager.js]
|
||||
[test_0070_update_dir_cleanup.js]
|
||||
[test_0071_update_dir_cleanup.js]
|
||||
[test_0072_update_dir_cleanup.js]
|
||||
[test_0073_update_dir_cleanup.js]
|
||||
[test_0080_prompt_silent.js]
|
||||
[test_0081_prompt_uiAlreadyOpen.js]
|
||||
skip-if = toolkit == 'gonk'
|
||||
reason = custom nsIUpdatePrompt
|
||||
[test_0082_prompt_unsupportAlreadyNotified.js]
|
||||
skip-if = toolkit == 'gonk'
|
||||
reason = custom nsIUpdatePrompt
|
||||
|
||||
; Tests that require the updater binary. Conditions for the included ini file
|
||||
; aren't used due to cascading of the conditions (see bug 676876).
|
||||
[include:xpcshell_updater.ini]
|
||||
|
||||
[test_bug595059.js]
|
||||
skip-if = toolkit == 'gonk'
|
||||
reason = custom nsIUpdatePrompt
|
||||
[test_bug794211.js]
|
||||
[test_bug833708.js]
|
||||
run-if = toolkit == 'gonk'
|
||||
@ -1,89 +0,0 @@
|
||||
; Tests that require the updater binary. These tests should never run on android.
|
||||
|
||||
[test_0110_general.js]
|
||||
skip-if = os == 'android'
|
||||
[test_0111_general.js]
|
||||
skip-if = os == 'android'
|
||||
[test_0112_general.js]
|
||||
skip-if = os == 'android'
|
||||
[test_0113_general.js]
|
||||
skip-if = os == 'mac' || toolkit == 'gonk' || os == 'android'
|
||||
reason = bug 820380
|
||||
[test_0113_versionDowngradeCheck.js]
|
||||
run-sequentially = Need to investigate.
|
||||
run-if = os == 'win'
|
||||
[test_0114_general.js]
|
||||
skip-if = os == 'mac' || os == 'android'
|
||||
[test_0114_productChannelCheck.js]
|
||||
run-if = os == 'win'
|
||||
[test_0115_general.js]
|
||||
skip-if = os == 'android'
|
||||
[test_0150_appBinReplaced_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0151_appBinPatched_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0152_appBinReplaced_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0153_appBinPatched_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0160_appInUse_complete.js]
|
||||
run-if = os == 'linux' || os == 'mac' || os == 'sunos' || os == 'win'
|
||||
[test_0161_appInUse_xp_unix_complete.js]
|
||||
run-if = os == 'linux' || os == 'sunos'
|
||||
[test_0161_appInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0162_appInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0170_fileLocked_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0171_fileLocked_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0172_fileLocked_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0173_fileLocked_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0174_fileLocked_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0175_fileLocked_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0180_fileInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0181_fileInUse_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0182_rmrfdirFileInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0183_rmrfdirFileInUse_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0184_fileInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0185_fileInUse_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0186_rmrfdirFileInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0187_rmrfdirFileInUse_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0188_fileInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0189_fileInUse_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0190_rmrfdirFileInUse_xp_win_complete.js]
|
||||
run-if = os == 'win'
|
||||
[test_0191_rmrfdirFileInUse_xp_win_partial.js]
|
||||
run-if = os == 'win'
|
||||
[test_0200_app_launch_apply_update.js]
|
||||
run-sequentially = Launches application.
|
||||
skip-if = toolkit == 'gonk' || os == 'android'
|
||||
reason = bug 820380
|
||||
[test_0201_app_launch_apply_update.js]
|
||||
run-sequentially = Launches application.
|
||||
skip-if = toolkit == 'gonk' || os == 'android'
|
||||
reason = bug 820380
|
||||
[test_0202_app_launch_apply_update_dirlocked.js]
|
||||
run-sequentially = Launches application.
|
||||
run-if = os == 'win'
|
||||
[test_0203_app_launch_apply_update.js]
|
||||
run-sequentially = Launches application.
|
||||
run-if = os == 'win'
|
||||
[test_0300_update_root_dir_migration.js]
|
||||
run-sequentially = Launches application.
|
||||
run-if = os == 'win'
|
||||
@ -1,31 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
TESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
|
||||
|
||||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
|
||||
-DBIN_SUFFIX=$(BIN_SUFFIX) \
|
||||
-DNS_NO_XPCOM \
|
||||
-DMOZ_DEBUG=$(MOZ_DEBUG) \
|
||||
$(NULL)
|
||||
|
||||
# For debugging purposes only
|
||||
#DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs:: ../test/unit/head_update.js.in
|
||||
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $^ > $(TESTROOT)/unit/head_update.js
|
||||
|
||||
ifneq ($(OS_TARGET),Android)
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
libs::
|
||||
$(INSTALL) ../test/TestAUSHelper$(BIN_SUFFIX) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
|
||||
$(INSTALL) -D $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/data
|
||||
$(INSTALL) $(topsrcdir)/$(relativesrcdir)/../test/unit/data/* $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/data
|
||||
endif
|
||||
endif # Not Android
|
||||
@ -1,7 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
|
||||
@ -1,9 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
MODULE = 'test_timermanager'
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
|
||||
112
toolkit/mozapps/update/tests/Makefile.in
Normal file
112
toolkit/mozapps/update/tests/Makefile.in
Normal file
@ -0,0 +1,112 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
|
||||
CHROMETESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/$(relativesrcdir)
|
||||
|
||||
DEFINES += \
|
||||
-DAB_CD=$(AB_CD) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
|
||||
-DBIN_SUFFIX=$(BIN_SUFFIX) \
|
||||
-DNS_NO_XPCOM \
|
||||
-DMOZ_DEBUG=$(MOZ_DEBUG) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MAINTENANCE_SERVICE
|
||||
DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE)
|
||||
endif
|
||||
|
||||
# For debugging purposes only
|
||||
#DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK
|
||||
|
||||
PP_TARGETS += aus-update-head
|
||||
aus-update-head_FLAGS := -Fsubstitution $(DEFINES) $(ACDEFINES)
|
||||
aus-update-head := $(srcdir)/unit_aus_update/head_update.js
|
||||
aus-update-head_PATH := $(XPCSHELLTESTROOT)/unit_aus_update
|
||||
|
||||
INSTALL_TARGETS += xpcshell-data
|
||||
xpcshell-data_TARGET := libs
|
||||
xpcshell-data_DEST := $(XPCSHELLTESTROOT)/data
|
||||
xpcshell-data_FILES := $(wildcard $(srcdir)/data/*)
|
||||
|
||||
# Android doesn't use the Mozilla updater or the toolkit update UI
|
||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
INSTALL_TARGETS += base-updater-head
|
||||
base-updater-head_TARGET := libs
|
||||
base-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_base_updater
|
||||
base-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
|
||||
|
||||
INSTALL_TARGETS += service-updater-head
|
||||
service-updater-head_TARGET := libs
|
||||
service-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_service_updater
|
||||
service-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
|
||||
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
INSTALL_TARGETS += xpcshell-test-helper
|
||||
xpcshell-test-helper_TARGET := libs
|
||||
xpcshell-test-helper_DEST := $(XPCSHELLTESTROOT)/data
|
||||
xpcshell-test-helper_FILES := $(DIST)/bin/TestAUSHelper$(BIN_SUFFIX)
|
||||
endif # Not MOZ_PROFILE_GENERATE
|
||||
|
||||
_CHROME_SHARED := \
|
||||
update.sjs \
|
||||
utils.js \
|
||||
$(NULL)
|
||||
PP_TARGETS += chrome-shared
|
||||
chrome-shared := $(addprefix $(srcdir)/chrome/,$(_CHROME_SHARED))
|
||||
chrome-shared_PATH := $(CHROMETESTROOT)/chrome
|
||||
|
||||
_CHROME_DATA := \
|
||||
simple.mar \
|
||||
simple_no_pib.mar \
|
||||
$(NULL)
|
||||
INSTALL_TARGETS += chrome-data
|
||||
chrome-data_TARGET := libs
|
||||
chrome-data_DEST := $(CHROMETESTROOT)/data
|
||||
chrome-data_FILES := $(addprefix $(srcdir)/data/,$(_CHROME_DATA))
|
||||
|
||||
INI_TEST_FILES = \
|
||||
TestAUSReadStrings1.ini \
|
||||
TestAUSReadStrings2.ini \
|
||||
TestAUSReadStrings3.ini \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir) \
|
||||
-I$(topsrcdir)/toolkit/mozapps/update \
|
||||
-I$(topsrcdir)/toolkit/mozapps/update/common \
|
||||
$(NULL)
|
||||
|
||||
MOZ_WINCONSOLE = 1
|
||||
|
||||
LIBS += \
|
||||
../common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
DEFINES += -DUNICODE -D_UNICODE
|
||||
endif # WINNT
|
||||
endif # Not Android
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
# TestAUSReadStrings runs during check in the following directory with a Unicode
|
||||
# char in order to test bug 473417 on Windows.
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
bug473417dir = test_bug473417-ó
|
||||
else
|
||||
bug473417dir = test_bug473417
|
||||
endif
|
||||
|
||||
check::
|
||||
$(RM) -rf $(DEPTH)/_tests/updater/ && $(NSINSTALL) -D $(DEPTH)/_tests/updater/$(bug473417dir)/
|
||||
for i in $(INI_TEST_FILES); do \
|
||||
$(INSTALL) $(srcdir)/$$i $(DEPTH)/_tests/updater/$(bug473417dir)/; \
|
||||
done
|
||||
$(INSTALL) $(FINAL_TARGET)/TestAUSReadStrings$(BIN_SUFFIX) $(DEPTH)/_tests/updater/$(bug473417dir)/
|
||||
@$(RUN_TEST_PROGRAM) $(DEPTH)/_tests/updater/$(bug473417dir)/TestAUSReadStrings$(BIN_SUFFIX)
|
||||
endif # Not Android
|
||||
@ -1,8 +1,17 @@
|
||||
; This Source Code Form is subject to the terms of the Mozilla Public
|
||||
; License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
[DEFAULT]
|
||||
support-files =
|
||||
../unit/data/simple.mar
|
||||
../unit/data/simple_no_pib.mar
|
||||
utils.js
|
||||
update.sjs
|
||||
generated-files =
|
||||
utils.js
|
||||
update.sjs
|
||||
|
||||
; mochitest-chrome tests must start with "test_" and are executed in sorted
|
||||
; order and not in the order specified in the manifest.
|
||||
[test_0011_check_basic.xul]
|
||||
[test_0012_check_basic_license.xul]
|
||||
[test_0013_check_incompat_basic.xul]
|
||||
@ -34,7 +34,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -74,7 +74,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showLicense=1&showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showLicense=1&showDetails=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -38,7 +38,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -78,7 +78,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showLicense=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showLicense=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -47,7 +47,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -87,7 +87,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showLicense=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showLicense=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -36,7 +36,7 @@ function runTest() {
|
||||
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, true);
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
setupTimer(180000); // 180 seconds
|
||||
@ -41,7 +41,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -83,8 +83,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&showDetails=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1" +
|
||||
"&showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -45,7 +45,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -87,7 +87,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -56,7 +56,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -96,7 +96,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -32,7 +32,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&showPrompt=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&showPrompt=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gAUS.checkForBackgroundUpdates();
|
||||
@ -72,7 +72,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showLicense=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showLicense=1&showDetails=1&showPrompt=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -36,7 +36,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -76,7 +76,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showLicense=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showLicense=1&showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -45,7 +45,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -85,7 +85,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showLicense=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showLicense=1&showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -39,7 +39,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showDetails=1&showPrompt=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -81,8 +81,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&showDetails=1" +
|
||||
"&showPrompt=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1" +
|
||||
"&showDetails=1&showPrompt=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gAUS.notify(null);
|
||||
@ -43,7 +43,7 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showPrompt=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showPrompt=1&showDetails=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -85,7 +85,8 @@ gDisableNoUpdateAddon = true;
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1" +
|
||||
"&showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -54,7 +54,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -94,7 +94,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&showDetails=1&showPrompt=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1" +
|
||||
"&showDetails=1&showPrompt=1" +
|
||||
getVersionParams(getNewerAppVersion(), getNewerPlatformVersion());
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -29,7 +29,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?xmlMalformed=1";
|
||||
let url = URL_HTTP_UPDATE_XML + "?xmlMalformed=1";
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -29,7 +29,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?noUpdates=1";
|
||||
let url = URL_HTTP_UPDATE_XML + "?noUpdates=1";
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -40,8 +40,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showLicense=1&remoteNoTypeAttr=1" +
|
||||
"&showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showLicense=1" +
|
||||
"&remoteNoTypeAttr=1&showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -40,7 +40,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?billboard404=1&license404=1&showDetails=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?billboard404=1&license404=1&showDetails=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -34,8 +34,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&partialPatchOnly=1&invalidPartialHash=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&partialPatchOnly=1" +
|
||||
"&invalidPartialHash=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -34,8 +34,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&completePatchOnly=1&invalidCompleteHash=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&completePatchOnly=1" +
|
||||
"&invalidCompleteHash=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -34,8 +34,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&invalidPartialHash=1&invalidCompleteHash=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&invalidPartialHash=1" +
|
||||
"&invalidCompleteHash=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -34,7 +34,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&invalidPartialHash=1" +
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&invalidPartialHash=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
@ -34,7 +34,7 @@ function runTest() {
|
||||
|
||||
// Specify the url to update.sjs with a slowDownloadMar param so the ui can
|
||||
// load before the download completes.
|
||||
let slowDownloadURL = URL_UPDATE + "?slowDownloadMar=1";
|
||||
let slowDownloadURL = URL_HTTP_UPDATE_XML + "?slowDownloadMar=1";
|
||||
let patches = getLocalPatchString("partial", null, null, null, null, null,
|
||||
STATE_PENDING) +
|
||||
getLocalPatchString("complete", slowDownloadURL, null, null,
|
||||
@ -34,7 +34,7 @@ function runTest() {
|
||||
|
||||
// Specify the url to update.sjs with a slowDownloadMar param so the ui can
|
||||
// load before the download completes.
|
||||
let slowDownloadURL = URL_UPDATE + "?slowDownloadMar=1";
|
||||
let slowDownloadURL = URL_HTTP_UPDATE_XML + "?slowDownloadMar=1";
|
||||
let patches = getLocalPatchString("partial", null, null, null, null, null,
|
||||
STATE_PENDING) +
|
||||
getLocalPatchString("complete", slowDownloadURL, "MD5",
|
||||
@ -29,7 +29,7 @@ function runTest() {
|
||||
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 1);
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gAUS.notify(null);
|
||||
@ -30,7 +30,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, true);
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 1);
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
setupTimer(180000); // 180 seconds
|
||||
@ -31,7 +31,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_SERVICE_ENABLED, true);
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 1);
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
setupTimer(180000); // 180 seconds
|
||||
@ -34,7 +34,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showNever=1&showDetails=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showNever=1&showDetails=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
// add the never preference for this version to verify that checking for
|
||||
@ -42,7 +42,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showBillboard=1&showNever=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showBillboard=1&showNever=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
// add the never preference for this version to verify that checking for
|
||||
@ -31,7 +31,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?showDetails=1&showPrompt=1" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?showDetails=1&showPrompt=1" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
// add the never preference for this version to verify that checking for
|
||||
@ -84,8 +84,7 @@ function testXHRLoad(aEvent) {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, true);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, false);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?showDetails=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTPS_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -84,8 +84,7 @@ function testXHRLoad(aEvent) {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, false);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, true);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?showDetails=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTPS_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -37,8 +37,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, false);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, false);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?showDetails=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTPS_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -46,7 +45,6 @@ function runTest() {
|
||||
gUP.checkForUpdates();
|
||||
}
|
||||
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
@ -38,7 +38,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, false);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, true);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?noUpdates=1";
|
||||
let url = URL_HTTPS_UPDATE_XML + "?noUpdates=1";
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -38,8 +38,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, false);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, true);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?showDetails=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTPS_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -35,7 +35,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, false);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, true);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?noUpdates=1";
|
||||
let url = URL_HTTPS_UPDATE_XML + "?noUpdates=1";
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -35,8 +35,7 @@ function runTest() {
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_REQUIREBUILTIN, false);
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_CERT_CHECKATTRS, true);
|
||||
|
||||
let url = "https://example.com/" + URL_PATH + "/update.sjs?showDetails=1" +
|
||||
getVersionParams();
|
||||
let url = URL_HTTPS_UPDATE_XML + "?showDetails=1" + getVersionParams();
|
||||
gAppUpdateURLDefault = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_URL);
|
||||
debugDump("setting default pref " + PREF_APP_UPDATE_URL + " to " + url);
|
||||
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_URL, url);
|
||||
@ -30,7 +30,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?xmlMalformed=1";
|
||||
let url = URL_HTTP_UPDATE_XML + "?xmlMalformed=1";
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
errorsPrefObserver.init(PREF_APP_UPDATE_BACKGROUNDERRORS,
|
||||
@ -33,7 +33,7 @@ function runTest() {
|
||||
// it was shown previously.
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED, true);
|
||||
|
||||
let url = URL_UPDATE + "?unsupported=1";
|
||||
let url = URL_HTTP_UPDATE_XML + "?unsupported=1";
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -27,7 +27,7 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?unsupported=1";
|
||||
let url = URL_HTTP_UPDATE_XML + "?unsupported=1";
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gAUS.notify(null);
|
||||
@ -29,7 +29,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?oldFormat=1&type=minor" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?oldFormat=1&type=minor" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -38,7 +38,8 @@ const TESTS = [ {
|
||||
function runTest() {
|
||||
debugDump("entering");
|
||||
|
||||
let url = URL_UPDATE + "?oldFormat=1&type=major" + getVersionParams();
|
||||
let url = URL_HTTP_UPDATE_XML + "?oldFormat=1&type=major" +
|
||||
getVersionParams();
|
||||
setUpdateURLOverride(url);
|
||||
|
||||
gUP.checkForUpdates();
|
||||
@ -14,10 +14,11 @@ const AUS_Ci = Components.interfaces;
|
||||
|
||||
#include ../sharedUpdateXML.js
|
||||
|
||||
const URL_HOST = "http://example.com/";
|
||||
const URL_PATH = "chrome/toolkit/mozapps/update/test/chrome/";
|
||||
const URL_UPDATE = URL_HOST + URL_PATH + "update.sjs";
|
||||
const SERVICE_URL = URL_HOST + URL_PATH + FILE_SIMPLE_MAR;
|
||||
const URL_HOST = "http://example.com";
|
||||
const URL_PATH_UPDATE_XML = "/chrome/toolkit/mozapps/update/tests/chrome/update.sjs";
|
||||
const URL_HTTP_UPDATE_SJS = URL_HOST + URL_PATH_UPDATE_XML;
|
||||
const REL_PATH_DATA = "chrome/toolkit/mozapps/update/tests/data/";
|
||||
const SERVICE_URL = URL_HOST + "/" + REL_PATH_DATA + FILE_SIMPLE_MAR;
|
||||
|
||||
const SLOW_MAR_DOWNLOAD_INTERVAL = 100;
|
||||
var gTimer;
|
||||
@ -49,7 +50,7 @@ function handleRequest(aRequest, aResponse) {
|
||||
var marFile = AUS_Cc["@mozilla.org/file/directory_service;1"].
|
||||
getService(AUS_Ci.nsIProperties).
|
||||
get("CurWorkD", AUS_Ci.nsILocalFile);
|
||||
var path = URL_PATH + FILE_SIMPLE_MAR;
|
||||
var path = REL_PATH_DATA + FILE_SIMPLE_MAR;
|
||||
var pathParts = path.split("/");
|
||||
for(var i = 0; i < pathParts.length; ++i)
|
||||
marFile.append(pathParts[i]);
|
||||
@ -117,18 +118,18 @@ function handleRequest(aRequest, aResponse) {
|
||||
var platformVersion = params.platformVersion ? params.platformVersion : "99.8";
|
||||
var buildID = params.buildID ? params.buildID : "01234567890123";
|
||||
// XXXrstrong - not specifying a detailsURL will cause a leak due to bug 470244
|
||||
// var detailsURL = params.showDetails ? URL_UPDATE + "?uiURL=DETAILS" : null;
|
||||
var detailsURL = URL_UPDATE + "?uiURL=DETAILS";
|
||||
var billboardURL = params.showBillboard ? URL_UPDATE + "?uiURL=BILLBOARD" : null;
|
||||
// var detailsURL = params.showDetails ? URL_HTTP_UPDATE_SJS + "?uiURL=DETAILS" : null;
|
||||
var detailsURL = URL_HTTP_UPDATE_SJS + "?uiURL=DETAILS";
|
||||
var billboardURL = params.showBillboard ? URL_HTTP_UPDATE_SJS + "?uiURL=BILLBOARD" : null;
|
||||
if (billboardURL && params.remoteNoTypeAttr)
|
||||
billboardURL += "&remoteNoTypeAttr=1";
|
||||
if (params.billboard404)
|
||||
billboardURL = URL_HOST + URL_PATH + "missing.html";
|
||||
var licenseURL = params.showLicense ? URL_UPDATE + "?uiURL=LICENSE" : null;
|
||||
billboardURL = URL_HOST + "/missing.html";
|
||||
var licenseURL = params.showLicense ? URL_HTTP_UPDATE_SJS + "?uiURL=LICENSE" : null;
|
||||
if (licenseURL && params.remoteNoTypeAttr)
|
||||
licenseURL += "&remoteNoTypeAttr=1";
|
||||
if (params.license404)
|
||||
licenseURL = URL_HOST + URL_PATH + "missing.html";
|
||||
licenseURL = URL_HOST + "/missing.html";
|
||||
var showPrompt = params.showPrompt ? "true" : null;
|
||||
var showNever = params.showNever ? "true" : null;
|
||||
var promptWaitTime = params.promptWaitTime ? params.promptWaitTime : null;
|
||||
@ -142,7 +143,7 @@ function handleRequest(aRequest, aResponse) {
|
||||
showPrompt = null;
|
||||
showNever = null;
|
||||
showSurvey = null;
|
||||
detailsURL = URL_UPDATE + "?uiURL=BILLBOARD";
|
||||
detailsURL = URL_HTTP_UPDATE_SJS + "?uiURL=BILLBOARD";
|
||||
if (params.remoteNoTypeAttr)
|
||||
detailsURL += "&remoteNoTypeAttr=1";
|
||||
var extensionVersion = params.appVersion ? params.appVersion : "99.9";
|
||||
@ -234,7 +235,7 @@ function getUpdateRDF(aParams) {
|
||||
" <em:id>toolkit@mozilla.org</em:id>\n" +
|
||||
" <em:minVersion>0</em:minVersion>\n" +
|
||||
" <em:maxVersion>" + maxVersion + "</em:maxVersion>\n" +
|
||||
" <em:updateLink>" + URL_HOST + URL_PATH + "</em:updateLink>\n" +
|
||||
" <em:updateLink>" + URL_HTTP_UPDATE_SJS + "</em:updateLink>\n" +
|
||||
" <em:updateHash>sha256:0</em:updateHash>\n" +
|
||||
" </RDF:Description>\n" +
|
||||
" </em:targetApplication>\n" +
|
||||
@ -139,9 +139,12 @@ const PAGEID_INSTALLED = "installed"; // Done
|
||||
|
||||
const UPDATE_WINDOW_NAME = "Update:Wizard";
|
||||
|
||||
const URL_HOST = "http://example.com";
|
||||
const URL_PATH = "chrome/toolkit/mozapps/update/test/chrome";
|
||||
const URL_UPDATE = URL_HOST + "/" + URL_PATH + "/update.sjs";
|
||||
const URL_HOST = "http://example.com";
|
||||
const URL_PATH_UPDATE_XML = "/chrome/toolkit/mozapps/update/tests/chrome/update.sjs";
|
||||
const REL_PATH_DATA = "chrome/toolkit/mozapps/update/tests/data";
|
||||
|
||||
const URL_HTTP_UPDATE_XML = URL_HOST + URL_PATH_UPDATE_XML;
|
||||
const URL_HTTPS_UPDATE_XML = "https://example.com" + URL_PATH_UPDATE_XML;
|
||||
|
||||
const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
|
||||
|
||||
@ -158,6 +161,8 @@ const TEST_ADDONS = [ "appdisabled_1", "appdisabled_2",
|
||||
"updateversion_1", "updateversion_2",
|
||||
"userdisabled_1", "userdisabled_2", "hotfix" ];
|
||||
|
||||
var gURLData = URL_HOST + "/" + REL_PATH_DATA + "/";
|
||||
|
||||
var gTestTimeout = 45000; // 45 seconds
|
||||
var gTimeoutTimer;
|
||||
|
||||
@ -859,8 +864,8 @@ function setupPrefs() {
|
||||
if (Services.prefs.prefHasUserValue(PREF_EXTENSIONS_UPDATE_URL)) {
|
||||
gExtUpdateURL = Services.prefs.getCharPref(PREF_EXTENSIONS_UPDATE_URL);
|
||||
}
|
||||
let extUpdateUrl = URL_UPDATE + "?addonID=%ITEM_ID%&platformVersion=" +
|
||||
getNewerPlatformVersion();
|
||||
let extUpdateUrl = URL_HTTP_UPDATE_XML + "?addonID=%ITEM_ID%" +
|
||||
"&platformVersion=" + getNewerPlatformVersion();
|
||||
Services.prefs.setCharPref(PREF_EXTENSIONS_UPDATE_URL, extUpdateUrl);
|
||||
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
|
||||
|
Before Width: | Height: | Size: 878 B After Width: | Height: | Size: 878 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user