diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-22 10:38:47 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-08-22 13:50:34 +0100 |
| commit | a152f62d4d81ef6500b3e02dbc381e2414f9a11f (patch) | |
| tree | cca12e1c738c1d72b86277b75626534a31621d97 /harmony-tests/src/test/resources | |
| parent | 4dbeaf5cb275de51dd057939643a5d860c58c5a2 (diff) | |
| download | libcore-a152f62d4d81ef6500b3e02dbc381e2414f9a11f.zip libcore-a152f62d4d81ef6500b3e02dbc381e2414f9a11f.tar.gz libcore-a152f62d4d81ef6500b3e02dbc381e2414f9a11f.tar.bz2 | |
Move preference tests over from external/apache-harmony.
Also fixes all remaining failures. Most of them were
due to us not setting "user.dir" and "user.home" correctly.
Android has traditionally left those values blank. To fix
these tests, we need to change the default prefs factory
to one rooted at a temporary directory.
Note that this change attempts the minimal possible cleanup
(mainly style, commented code formatting etc.) to these files.
bug: 13881847
Change-Id: I1918ee9af07be9612a7da142b3e584aabc860085
Diffstat (limited to 'harmony-tests/src/test/resources')
5 files changed, 205 insertions, 0 deletions
diff --git a/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs-badencoding.xml b/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs-badencoding.xml new file mode 100644 index 0000000..182edc7 --- /dev/null +++ b/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs-badencoding.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="badencoding"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> + +<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'> + +<preferences EXTERNAL_XML_VERSION="1.0"> + <root type="user"> + <map/> + <node name="tests"> + <map/> + <node name="api"> + <map/> + <node name="java"> + <map/> + <node name="util"> + <map/> + <node name="prefs"> + <map> + <entry key="prefskey" value="newvalue"/> + <entry key="prefskey3" value="newvalue3"/> + </map> + <node name="mock"> + <map/> + <node name="child"> + <map> + <entry key="key2" value="value2"/> + </map> + <node name="grandson"> + <map> + <entry key="key3" value="value3"/> + </map> + <node name="grandgrandson"> + <map> + <entry key="key4" + value="value4"/> + </map> + </node> + </node> + </node> + </node> + </node> + </node> + </node> + </node> + </node> + </root> +</preferences> diff --git a/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs-badform.xml b/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs-badform.xml new file mode 100644 index 0000000..da3aeb9 --- /dev/null +++ b/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs-badform.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> + +<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'> + +<preferences EXTERNAL_XML_VERSION="1.0"> + <root type="user"> + <map/> + <node name="java"> + <map/> + <node name="util"> + <map/> + <node name="mock"> + <map/> + <node name="child"> + <map> + <entry key="key2" value="value2"/> + </map> + <node name="grandson"> + <map> + <entry key="key3" value="value3"/> + </map> + <node name="grandgrandson"> + <map> + <entry key="key4" value="value4"/> + </map> + </node> + </node> + </node> + </node> + </node> + </node> + </root> diff --git a/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs.xml b/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs.xml new file mode 100644 index 0000000..7bee4c7 --- /dev/null +++ b/harmony-tests/src/test/resources/resources/prefs/java/util/prefs/userprefs.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> + +<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'> + +<preferences EXTERNAL_XML_VERSION="1.0"> + <root type="user"> + <map/> + <node name="org"> + <map/> + <node name="apache"> + <map/> + <node name="harmony"> + <map/> + <node name="tests"> + <map/> + <node name="java"> + <map/> + <node name="util"> + <map/> + + <node name="prefs"> + <map> + <entry key="prefskey" + value="newvalue"/> + <entry key="prefskey3" + value="newvalue3"/> + </map> + + <node name="mock"> + <map/> + <node name="child"> + <map> + <entry key="key2" + value="value2"/> + </map> + <node name="grandson"> + <map> + <entry key="key3" + value="value3"/> + </map> + <node name="grandgrandson"> + <map> + <entry key="key4" + value="value4"/> + </map> + </node> + <!--grandgrandson--> + </node> + <!--grandson--> + </node> + <!--child--> + </node> + <!--mock--> + + </node> + <!--prefs--> + </node> + <!--util--> + </node> + <!--java--> + </node> + <!--tests--> + </node> + <!--harmony--> + </node> + <!--apache--> + </node> + <!--org--> + </root> +</preferences> diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..4d26113 --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser Binary files differnew file mode 100644 index 0000000..a15948d --- /dev/null +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser |