Removes copies of junit.html in I18N Change-Id: If2efa1cd6947b8d89b0d49c1acb6e6b40f7035cd
diff --git a/user/test/com/google/gwt/i18n/I18NTest_es_AR_runtime.gwt.xml b/user/test/com/google/gwt/i18n/I18NTest_es_AR_runtime.gwt.xml index 059d865..6f6cfb6 100644 --- a/user/test/com/google/gwt/i18n/I18NTest_es_AR_runtime.gwt.xml +++ b/user/test/com/google/gwt/i18n/I18NTest_es_AR_runtime.gwt.xml
@@ -22,5 +22,4 @@ <set-property name = "locale" value = "es_419"/> <extend-configuration-property name="runtime.locales" value="es_AR"/> <extend-configuration-property name="runtime.locales" value="es_MX"/> - <public path="public_es_AR"/> </module>
diff --git a/user/test/com/google/gwt/i18n/I18NTest_es_MX_runtime.gwt.xml b/user/test/com/google/gwt/i18n/I18NTest_es_MX_runtime.gwt.xml index 0dc6c8c..6f6cfb6 100644 --- a/user/test/com/google/gwt/i18n/I18NTest_es_MX_runtime.gwt.xml +++ b/user/test/com/google/gwt/i18n/I18NTest_es_MX_runtime.gwt.xml
@@ -22,5 +22,4 @@ <set-property name = "locale" value = "es_419"/> <extend-configuration-property name="runtime.locales" value="es_AR"/> <extend-configuration-property name="runtime.locales" value="es_MX"/> - <public path="public_es_MX"/> </module>
diff --git a/user/test/com/google/gwt/i18n/client/I18N_es_AR_RuntimeTest.java b/user/test/com/google/gwt/i18n/client/I18N_es_AR_RuntimeTest.java index e4a9d37..ec5101e 100644 --- a/user/test/com/google/gwt/i18n/client/I18N_es_AR_RuntimeTest.java +++ b/user/test/com/google/gwt/i18n/client/I18N_es_AR_RuntimeTest.java
@@ -30,6 +30,16 @@ */ public class I18N_es_AR_RuntimeTest extends GWTTestCase { + static { + if (GWT.isClient()) { + setLocale(); + } + } + + private static native void setLocale() /*-{ + $wnd['__gwt_Locale'] = 'es_AR'; + }-*/; + @Override public String getModuleName() { return "com.google.gwt.i18n.I18NTest_es_AR_runtime";
diff --git a/user/test/com/google/gwt/i18n/client/I18N_es_MX_RuntimeTest.java b/user/test/com/google/gwt/i18n/client/I18N_es_MX_RuntimeTest.java index 42acaf6..ec58ba3 100644 --- a/user/test/com/google/gwt/i18n/client/I18N_es_MX_RuntimeTest.java +++ b/user/test/com/google/gwt/i18n/client/I18N_es_MX_RuntimeTest.java
@@ -30,6 +30,16 @@ */ public class I18N_es_MX_RuntimeTest extends GWTTestCase { + static { + if (GWT.isClient()) { + setLocale(); + } + } + + private static native void setLocale() /*-{ + $wnd['__gwt_Locale'] = 'es_MX'; + }-*/; + @Override public String getModuleName() { return "com.google.gwt.i18n.I18NTest_es_MX_runtime";
diff --git a/user/test/com/google/gwt/i18n/public_es_AR/junit-standards.html b/user/test/com/google/gwt/i18n/public_es_AR/junit-standards.html deleted file mode 100644 index 6952c9b..0000000 --- a/user/test/com/google/gwt/i18n/public_es_AR/junit-standards.html +++ /dev/null
@@ -1,73 +0,0 @@ -<!doctype html> -<!-- -Copyright 2008 Google Inc. - -Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -License for the specific language governing permissions and limitations under -the License. ---> -<html> -<head> -<meta name='gwt:onLoadErrorFn' content='junitOnLoadErrorFn'> -<meta name='gwt:onPropertyErrorFn' content='junitOnPropertyErrorFn'> -</head> -<body> -<script language='javascript'> -<!-- -// -- BEGIN CHANGE FROM junit/public/junit.html -// Set the runtime locale for this test -// TODO(jat): find a better way to do this that doesn't require duplcating -// junit.html for each different runtime locale. -window['__gwt_Locale'] = 'es_AR'; -// -- END CHANGE FROM junit/public/junit.html - -function junitOnLoadErrorFn(moduleName) { - junitError('Failed to load module "' + moduleName + - '".\nPlease see the log for details.'); -} - -function junitOnPropertyErrorFn(propName, allowedValues, badValue) { - var msg = 'While attempting to load the module, property "' + propName; - if (badValue != null) { - msg += '" was set to the unexpected value "' + badValue + '"'; - } else { - msg += '" was not specified'; - } - msg += 'Allowed values: ' + allowedValues; - junitError(msg); -} - -function junitError(msg) { - var xmlHttpRequest = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"); - xmlHttpRequest.open('POST', 'junithost/loadError', true); - xmlHttpRequest.setRequestHeader('Content-Type', 'text/x-gwt-rpc; charset=utf-8'); - xmlHttpRequest.send(msg); -} - -function loadSelectionScript() { - var moduleName = location.pathname; - var pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(0, pos); - pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(pos + 1); - document.write('<script language="javascript" src="' + encodeURIComponent(moduleName) + '.nocache.js"><\/script>'); -} -loadSelectionScript(); ---> -</script> -<noscript> - <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - Your web browser must have JavaScript enabled - in order for this application to display correctly. - </div> -</noscript> -</body> -</html>
diff --git a/user/test/com/google/gwt/i18n/public_es_AR/junit.html b/user/test/com/google/gwt/i18n/public_es_AR/junit.html deleted file mode 100644 index f0782cc..0000000 --- a/user/test/com/google/gwt/i18n/public_es_AR/junit.html +++ /dev/null
@@ -1,72 +0,0 @@ -<!-- -Copyright 2008 Google Inc. - -Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -License for the specific language governing permissions and limitations under -the License. ---> -<html> -<head> -<meta name='gwt:onLoadErrorFn' content='junitOnLoadErrorFn'> -<meta name='gwt:onPropertyErrorFn' content='junitOnPropertyErrorFn'> -</head> -<body> -<script language='javascript'> -<!-- -// -- BEGIN CHANGE FROM junit/public/junit.html -// Set the runtime locale for this test -// TODO(jat): find a better way to do this that doesn't require duplcating -// junit.html for each different runtime locale. -window['__gwt_Locale'] = 'es_AR'; -// -- END CHANGE FROM junit/public/junit.html - -function junitOnLoadErrorFn(moduleName) { - junitError('Failed to load module "' + moduleName + - '".\nPlease see the log for details.'); -} - -function junitOnPropertyErrorFn(propName, allowedValues, badValue) { - var msg = 'While attempting to load the module, property "' + propName; - if (badValue != null) { - msg += '" was set to the unexpected value "' + badValue + '"'; - } else { - msg += '" was not specified'; - } - msg += 'Allowed values: ' + allowedValues; - junitError(msg); -} - -function junitError(msg) { - var xmlHttpRequest = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"); - xmlHttpRequest.open('POST', 'junithost/loadError', true); - xmlHttpRequest.setRequestHeader('Content-Type', 'text/x-gwt-rpc; charset=utf-8'); - xmlHttpRequest.send(msg); -} - -function loadSelectionScript() { - var moduleName = location.pathname; - var pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(0, pos); - pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(pos + 1); - document.write('<script language="javascript" src="' + encodeURIComponent(moduleName) + '.nocache.js"><\/script>'); -} -loadSelectionScript(); ---> -</script> -<noscript> - <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - Your web browser must have JavaScript enabled - in order for this application to display correctly. - </div> -</noscript> -</body> -</html>
diff --git a/user/test/com/google/gwt/i18n/public_es_MX/junit-standards.html b/user/test/com/google/gwt/i18n/public_es_MX/junit-standards.html deleted file mode 100644 index 05bcd9d..0000000 --- a/user/test/com/google/gwt/i18n/public_es_MX/junit-standards.html +++ /dev/null
@@ -1,73 +0,0 @@ -<!doctype html> -<!-- -Copyright 2008 Google Inc. - -Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -License for the specific language governing permissions and limitations under -the License. ---> -<html> -<head> -<meta name='gwt:onLoadErrorFn' content='junitOnLoadErrorFn'> -<meta name='gwt:onPropertyErrorFn' content='junitOnPropertyErrorFn'> -</head> -<body> -<script language='javascript'> -<!-- -// -- BEGIN CHANGE FROM junit/public/junit.html -// Set the runtime locale for this test -// TODO(jat): find a better way to do this that doesn't require duplcating -// junit.html for each different runtime locale. -window['__gwt_Locale'] = 'es_MX'; -// -- END CHANGE FROM junit/public/junit.html - -function junitOnLoadErrorFn(moduleName) { - junitError('Failed to load module "' + moduleName + - '".\nPlease see the log for details.'); -} - -function junitOnPropertyErrorFn(propName, allowedValues, badValue) { - var msg = 'While attempting to load the module, property "' + propName; - if (badValue != null) { - msg += '" was set to the unexpected value "' + badValue + '"'; - } else { - msg += '" was not specified'; - } - msg += 'Allowed values: ' + allowedValues; - junitError(msg); -} - -function junitError(msg) { - var xmlHttpRequest = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"); - xmlHttpRequest.open('POST', 'junithost/loadError', true); - xmlHttpRequest.setRequestHeader('Content-Type', 'text/x-gwt-rpc; charset=utf-8'); - xmlHttpRequest.send(msg); -} - -function loadSelectionScript() { - var moduleName = location.pathname; - var pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(0, pos); - pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(pos + 1); - document.write('<script language="javascript" src="' + encodeURIComponent(moduleName) + '.nocache.js"><\/script>'); -} -loadSelectionScript(); ---> -</script> -<noscript> - <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - Your web browser must have JavaScript enabled - in order for this application to display correctly. - </div> -</noscript> -</body> -</html>
diff --git a/user/test/com/google/gwt/i18n/public_es_MX/junit.html b/user/test/com/google/gwt/i18n/public_es_MX/junit.html deleted file mode 100644 index adc2908..0000000 --- a/user/test/com/google/gwt/i18n/public_es_MX/junit.html +++ /dev/null
@@ -1,72 +0,0 @@ -<!-- -Copyright 2008 Google Inc. - -Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -License for the specific language governing permissions and limitations under -the License. ---> -<html> -<head> -<meta name='gwt:onLoadErrorFn' content='junitOnLoadErrorFn'> -<meta name='gwt:onPropertyErrorFn' content='junitOnPropertyErrorFn'> -</head> -<body> -<script language='javascript'> -<!-- -// -- BEGIN CHANGE FROM junit/public/junit.html -// Set the runtime locale for this test -// TODO(jat): find a better way to do this that doesn't require duplcating -// junit.html for each different runtime locale. -window['__gwt_Locale'] = 'es_MX'; -// -- END CHANGE FROM junit/public/junit.html - -function junitOnLoadErrorFn(moduleName) { - junitError('Failed to load module "' + moduleName + - '".\nPlease see the log for details.'); -} - -function junitOnPropertyErrorFn(propName, allowedValues, badValue) { - var msg = 'While attempting to load the module, property "' + propName; - if (badValue != null) { - msg += '" was set to the unexpected value "' + badValue + '"'; - } else { - msg += '" was not specified'; - } - msg += 'Allowed values: ' + allowedValues; - junitError(msg); -} - -function junitError(msg) { - var xmlHttpRequest = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"); - xmlHttpRequest.open('POST', 'junithost/loadError', true); - xmlHttpRequest.setRequestHeader('Content-Type', 'text/x-gwt-rpc; charset=utf-8'); - xmlHttpRequest.send(msg); -} - -function loadSelectionScript() { - var moduleName = location.pathname; - var pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(0, pos); - pos = moduleName.lastIndexOf('/'); - moduleName = moduleName.substr(pos + 1); - document.write('<script language="javascript" src="' + encodeURIComponent(moduleName) + '.nocache.js"><\/script>'); -} -loadSelectionScript(); ---> -</script> -<noscript> - <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - Your web browser must have JavaScript enabled - in order for this application to display correctly. - </div> -</noscript> -</body> -</html>