From 3301d590ed6b6fe98564ec32e9115ccf5647bd1f Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 13 Apr 2011 13:53:24 -0400
Subject: [PATCH] Bug 462172, fix up preventDefault call in drag synthesis test
 and move to a chrome test

--HG--
rename : testing/mochitest/tests/SimpleTest/tests/test_synthesizeDragStart.xul => testing/mochitest/chrome/test_synthesizeDragStart.xul
rename : testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul => testing/mochitest/chrome/test_synthesizeDrop.xul
---
 testing/mochitest/chrome/Makefile.in          |  2 +
 .../test_synthesizeDragStart.xul              |  0
 .../tests => chrome}/test_synthesizeDrop.xul  |  6 +--
 .../mochitest/tests/SimpleTest/Makefile.in    |  3 --
 .../tests/SimpleTest/tests/Makefile.in        | 49 -------------------
 5 files changed, 4 insertions(+), 56 deletions(-)
 rename testing/mochitest/{tests/SimpleTest/tests => chrome}/test_synthesizeDragStart.xul (100%)
 rename testing/mochitest/{tests/SimpleTest/tests => chrome}/test_synthesizeDrop.xul (95%)
 delete mode 100644 testing/mochitest/tests/SimpleTest/tests/Makefile.in

diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in
index 4e7fad93557..c6b73a5c0b1 100644
--- a/testing/mochitest/chrome/Makefile.in
+++ b/testing/mochitest/chrome/Makefile.in
@@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _STATIC_FILES = test_sample.xul \
+		test_synthesizeDragStart.xul \
+		test_synthesizeDrop.xul \
 		$(NULL)
 
 libs:: $(_STATIC_FILES)
diff --git a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDragStart.xul b/testing/mochitest/chrome/test_synthesizeDragStart.xul
similarity index 100%
rename from testing/mochitest/tests/SimpleTest/tests/test_synthesizeDragStart.xul
rename to testing/mochitest/chrome/test_synthesizeDragStart.xul
diff --git a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul b/testing/mochitest/chrome/test_synthesizeDrop.xul
similarity index 95%
rename from testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
rename to testing/mochitest/chrome/test_synthesizeDrop.xul
index d4b24bc4d67..0ffe88223e7 100644
--- a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
+++ b/testing/mochitest/chrome/test_synthesizeDrop.xul
@@ -41,8 +41,6 @@
  * Assure EventUtils can perform synthesizeDrop as specified
  */
 
-_tests\testing\mochitest\chrome\testing\mochitest\tests\SimpleTest\tests\test_synthesizeDrop.xul
-
 -->
 <window title="Mozilla Bug 462172 extra tests for synthesizeDrop"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -70,8 +68,8 @@ var drag1 = [[
 function doOnDrop(aEvent)
 {
   gData = aEvent.dataTransfer.getData(drag1[0][0].type);
-  aEvent.preventDefault; // cancels event and keeps dropEffect
-                         // as was before event.
+  aEvent.preventDefault(); // cancels event and keeps dropEffect
+                           // as was before event.
 }
 
 function doOnDragEnter(aEvent)
diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in
index d0000aa5308..99f3daa2cd6 100644
--- a/testing/mochitest/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/SimpleTest/Makefile.in
@@ -41,9 +41,6 @@ VPATH		= @srcdir@
 relativesrcdir  = testing/mochitest/tests/SimpleTest
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = tests \
-       $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 _SIMPLETEST_FILES =	MozillaFileLogger.js \
 			quit.js \
diff --git a/testing/mochitest/tests/SimpleTest/tests/Makefile.in b/testing/mochitest/tests/SimpleTest/tests/Makefile.in
deleted file mode 100644
index 9919064e8b2..00000000000
--- a/testing/mochitest/tests/SimpleTest/tests/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# ***** 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
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either 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  = testing/mochitest/tests/SimpleTest/tests
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-_CHROME_FILES =	test_synthesizeDragStart.xul \
-                test_synthesizeDrop.xul \
-			$(NULL)
-libs:: $(_CHROME_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)