From 1441d772930457c25e1452685a974d66f57e9d46 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Tue, 23 Dec 2008 15:58:44 +0100 Subject: [PATCH] bug 469593 - test_423060.xul fails on SeaMonkey, r=gavin --HG-- rename : toolkit/components/places/tests/chrome/Makefile.in => browser/components/feeds/test/chrome/Makefile.in rename : toolkit/components/places/tests/chrome/sample_feed.atom => browser/components/feeds/test/chrome/sample_feed.atom rename : toolkit/components/places/tests/chrome/test_423060.xul => browser/components/feeds/test/chrome/test_423060.xul --- browser/components/feeds/test/Makefile.in | 4 ++ .../components/feeds/test/chrome/Makefile.in | 61 +++++++++++++++++++ .../feeds/test/chrome/sample_feed.atom | 23 +++++++ .../feeds/test}/chrome/test_423060.xul | 0 .../places/tests/chrome/Makefile.in | 1 - 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 browser/components/feeds/test/chrome/Makefile.in create mode 100644 browser/components/feeds/test/chrome/sample_feed.atom rename {toolkit/components/places/tests => browser/components/feeds/test}/chrome/test_423060.xul (100%) diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in index 1360a42b727..36265d91dab 100644 --- a/browser/components/feeds/test/Makefile.in +++ b/browser/components/feeds/test/Makefile.in @@ -45,6 +45,10 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_browser_feeds XPCSHELL_TESTS = unit +DIRS = \ + chrome \ + $(NULL) + include $(topsrcdir)/config/rules.mk _TEST_FILES = test_bug408328.html \ diff --git a/browser/components/feeds/test/chrome/Makefile.in b/browser/components/feeds/test/chrome/Makefile.in new file mode 100644 index 00000000000..ed3f8d957b1 --- /dev/null +++ b/browser/components/feeds/test/chrome/Makefile.in @@ -0,0 +1,61 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# Mozilla.org. +# Portions created by the Initial Developer are Copyright (C) 2005 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either of the GNU General Public License Version 2 or later (the "GPL"), +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +relativesrcdir = browser/components/feeds/test/chrome + +include $(DEPTH)/config/autoconf.mk +include $(topsrcdir)/config/rules.mk + +# sample_feed.atom was copied from toolkit/components/places/tests/chrome +_HTTP_FILES = \ + sample_feed.atom \ + $(NULL) + +_CHROME_FILES = \ + test_423060.xul \ + $(NULL) + +libs:: $(_HTTP_FILES) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) + +libs:: $(_CHROME_FILES) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) + diff --git a/browser/components/feeds/test/chrome/sample_feed.atom b/browser/components/feeds/test/chrome/sample_feed.atom new file mode 100644 index 00000000000..add75efb4d6 --- /dev/null +++ b/browser/components/feeds/test/chrome/sample_feed.atom @@ -0,0 +1,23 @@ + + + + Example Feed + + 2003-12-13T18:30:02Z + + + John Doe + + urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 + + + + Atom-Powered Robots Run Amok + + urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a + 2003-12-13T18:30:02Z + + Some text. + + + diff --git a/toolkit/components/places/tests/chrome/test_423060.xul b/browser/components/feeds/test/chrome/test_423060.xul similarity index 100% rename from toolkit/components/places/tests/chrome/test_423060.xul rename to browser/components/feeds/test/chrome/test_423060.xul diff --git a/toolkit/components/places/tests/chrome/Makefile.in b/toolkit/components/places/tests/chrome/Makefile.in index 6699b19b285..acbacf30a38 100644 --- a/toolkit/components/places/tests/chrome/Makefile.in +++ b/toolkit/components/places/tests/chrome/Makefile.in @@ -57,7 +57,6 @@ _CHROME_FILES = \ test_342484.xul \ test_341972a.xul \ test_381357.xul \ - test_423060.xul \ $(NULL) libs:: $(_HTTP_FILES)