You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by to...@apache.org on 2009/01/20 06:47:41 UTC
svn commit: r735939 [5/5] - in /harmony/enhanced/classlib/branches/java6: ./
modules/auth/META-INF/ modules/beans/src/main/java/java/beans/
modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/
modules/beans/src/test/support/java/org/a...
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java Mon Jan 19 21:47:38 2009
@@ -25,24 +25,24 @@
*/
public class AllTests {
- public static void main(String[] args) {
- junit.textui.TestRunner.run(AllTests.suite());
- }
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(AllTests.suite());
+ }
- public static Test suite() {
- TestSuite suite = new TestSuite("Suite for org.apache.harmony.prefs.tests.java.util.prefs");
- // $JUnit-BEGIN$
- suite.addTestSuite(NodeChangeListenerTest.class);
- suite.addTestSuite(PreferenceChangeListenerTest.class);
- suite.addTestSuite(PreferencesFactoryTest.class);
- suite.addTestSuite(BackingStoreExceptionTest.class);
- suite.addTestSuite(InvalidPreferencesFormatExceptionTest.class);
- suite.addTestSuite(PreferenceChangeEventTest.class);
- suite.addTestSuite(NodeChangeEventTest.class);
- suite.addTestSuite(PreferencesTest.class);
- suite.addTestSuite(AbstractPreferencesTest.class);
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Suite for org.apache.harmony.prefs.tests.java.util.prefs");
+ // $JUnit-BEGIN$
+ suite.addTestSuite(NodeChangeListenerTest.class);
+ suite.addTestSuite(PreferenceChangeListenerTest.class);
+ suite.addTestSuite(PreferencesFactoryTest.class);
+ suite.addTestSuite(BackingStoreExceptionTest.class);
+ suite.addTestSuite(InvalidPreferencesFormatExceptionTest.class);
+ suite.addTestSuite(PreferenceChangeEventTest.class);
+ suite.addTestSuite(NodeChangeEventTest.class);
+ suite.addTestSuite(PreferencesTest.class);
+ suite.addTestSuite(AbstractPreferencesTest.class);
suite.addTestSuite(FilePreferencesImplTest.class);
- // $JUnit-END$
- return suite;
- }
+ // $JUnit-END$
+ return suite;
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java Mon Jan 19 21:47:38 2009
@@ -27,200 +27,204 @@
public class FilePreferencesImplTest extends TestCase {
private String prevFactory;
- private Preferences uroot;
- private Preferences sroot;
-
+ private Preferences uroot;
+ private Preferences sroot;
+
public FilePreferencesImplTest() {
super();
}
-
+
+ @Override
protected void setUp() throws Exception {
prevFactory = System.getProperty("java.util.prefs.PreferencesFactory");
System.setProperty("java.util.prefs.PreferencesFactory", "java.util.prefs.FilePreferencesFactoryImpl");
-
+
uroot = Preferences.userRoot();
sroot = Preferences.systemRoot();
}
-
+
+ @Override
protected void tearDown() throws Exception {
if (prevFactory != null)
System.setProperty("java.util.prefs.PreferencesFactory", prevFactory);
-
+
uroot = null;
sroot = null;
}
- public void testPutGet() throws IOException, BackingStoreException {
- uroot.put("ukey1", "value1");
- assertEquals("value1", uroot.get("ukey1", null));
- String[] names = uroot.keys();
- assertEquals(1, names.length);
-
- uroot.put("ukey2", "value3");
- assertEquals("value3", uroot.get("ukey2", null));
- uroot.put("\u4e2d key1", "\u4e2d value1");
- assertEquals("\u4e2d value1", uroot.get("\u4e2d key1", null));
- names = uroot.keys();
- assertEquals(3, names.length);
-
- uroot.flush();
- uroot.clear();
- names = uroot.keys();
- assertEquals(0, names.length);
-
- sroot.put("skey1", "value1");
- assertEquals("value1", sroot.get("skey1", null));
- sroot.put("\u4e2d key1", "\u4e2d value1");
- assertEquals("\u4e2d value1", sroot.get("\u4e2d key1", null));
- }
-
- public void testChildNodes() throws Exception {
- Preferences child1 = uroot.node("child1");
- Preferences child2 = uroot.node("\u4e2d child2");
- Preferences grandchild = child1.node("grand");
+ public void testPutGet() throws IOException, BackingStoreException {
+ uroot.put("ukey1", "value1");
+ assertEquals("value1", uroot.get("ukey1", null));
+ String[] names = uroot.keys();
+ assertEquals(1, names.length);
+
+ uroot.put("ukey2", "value3");
+ assertEquals("value3", uroot.get("ukey2", null));
+ uroot.put("\u4e2d key1", "\u4e2d value1");
+ assertEquals("\u4e2d value1", uroot.get("\u4e2d key1", null));
+ names = uroot.keys();
+ assertEquals(3, names.length);
+
+ uroot.flush();
+ uroot.clear();
+ names = uroot.keys();
+ assertEquals(0, names.length);
+
+ sroot.put("skey1", "value1");
+ assertEquals("value1", sroot.get("skey1", null));
+ sroot.put("\u4e2d key1", "\u4e2d value1");
+ assertEquals("\u4e2d value1", sroot.get("\u4e2d key1", null));
+ }
+
+ public void testChildNodes() throws Exception {
+ Preferences child1 = uroot.node("child1");
+ Preferences child2 = uroot.node("\u4e2d child2");
+ Preferences grandchild = child1.node("grand");
assertNotNull(grandchild);
- String[] childNames = uroot.childrenNames();
- assertEquals(2, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
-
- childNames = child1.childrenNames();
- assertEquals(1, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
-
- childNames = child2.childrenNames();
- assertEquals(0, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
-
- child1.removeNode();
- childNames = uroot.childrenNames();
- assertEquals(1, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
- // child2.removeNode();
- // childNames = uroot.childrenNames();
- // assertEquals(0, childNames.length);
-
- child1 = sroot.node("child1");
- child2 = sroot.node("child2");
- grandchild = child1.node("grand");
-
- childNames = sroot.childrenNames();
-
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
- assertEquals(2, childNames.length);
-
- childNames = child1.childrenNames();
- assertEquals(1, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
-
- childNames = child2.childrenNames();
- assertEquals(0, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
-
- child1.removeNode();
- assertNotSame(child1, sroot.node("child1"));
- assertSame(sroot.node("child1"), sroot.node("child1"));
- sroot.node("child1").removeNode();
- childNames = sroot.childrenNames();
- assertEquals(1, childNames.length);
- for (int i = 0; i < childNames.length; i++) {
- System.out.println(childNames[i]);
- }
- child2.removeNode();
- childNames = sroot.childrenNames();
- assertEquals(0, childNames.length);
- }
-
- public void testSecurityException() throws BackingStoreException {
- Preferences child1 = uroot.node("child1");
- MockFileSecurityManager manager = new MockFileSecurityManager();
- manager.install();
- try {
- try {
- uroot.node("securityNode");
- fail("should throw security exception");
- } catch (SecurityException e) {
- }
- try {
- // need FilePermission(delete);
- child1.removeNode();
- fail("should throw security exception");
- } catch (SecurityException e) {
- }
- try {
- uroot.childrenNames();
- fail("should throw security exception");
- } catch (SecurityException e) {
- }
- uroot.keys();
- uroot.put("securitykey", "value1");
- uroot.remove("securitykey");
- try {
- uroot.flush();
- fail("should throw security exception");
- } catch (SecurityException e) {
- } catch (BackingStoreException e) {
- assertTrue(e.getCause() instanceof SecurityException);
- }
- try {
- uroot.sync();
- fail("should throw security exception");
- } catch (SecurityException e) {
- } catch (BackingStoreException e) {
- assertTrue(e.getCause() instanceof SecurityException);
- }
- } finally {
- manager.restoreDefault();
- }
- }
-
- static class MockFileSecurityManager extends SecurityManager {
-
- SecurityManager dflt;
-
- public MockFileSecurityManager() {
- super();
- dflt = System.getSecurityManager();
- }
-
- public void install() {
- System.setSecurityManager(this);
- }
-
- public void restoreDefault() {
- System.setSecurityManager(dflt);
- }
-
- public void checkPermission(Permission perm) {
- if (perm instanceof FilePermission) {
- throw new SecurityException();
- } else if (dflt != null) {
- dflt.checkPermission(perm);
- }
- }
-
- public void checkPermission(Permission perm, Object ctx) {
- if (perm instanceof FilePermission) {
- System.out.println(perm.getActions());
- throw new SecurityException();
- } else if (dflt != null) {
- dflt.checkPermission(perm, ctx);
- }
- }
+ String[] childNames = uroot.childrenNames();
+ assertEquals(2, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+
+ childNames = child1.childrenNames();
+ assertEquals(1, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+
+ childNames = child2.childrenNames();
+ assertEquals(0, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+
+ child1.removeNode();
+ childNames = uroot.childrenNames();
+ assertEquals(1, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+ // child2.removeNode();
+ // childNames = uroot.childrenNames();
+ // assertEquals(0, childNames.length);
+
+ child1 = sroot.node("child1");
+ child2 = sroot.node("child2");
+ grandchild = child1.node("grand");
+
+ childNames = sroot.childrenNames();
+
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+ assertEquals(2, childNames.length);
+
+ childNames = child1.childrenNames();
+ assertEquals(1, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+
+ childNames = child2.childrenNames();
+ assertEquals(0, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+
+ child1.removeNode();
+ assertNotSame(child1, sroot.node("child1"));
+ assertSame(sroot.node("child1"), sroot.node("child1"));
+ sroot.node("child1").removeNode();
+ childNames = sroot.childrenNames();
+ assertEquals(1, childNames.length);
+ for (int i = 0; i < childNames.length; i++) {
+ System.out.println(childNames[i]);
+ }
+ child2.removeNode();
+ childNames = sroot.childrenNames();
+ assertEquals(0, childNames.length);
+ }
+
+ public void testSecurityException() throws BackingStoreException {
+ Preferences child1 = uroot.node("child1");
+ MockFileSecurityManager manager = new MockFileSecurityManager();
+ manager.install();
+ try {
+ try {
+ uroot.node("securityNode");
+ fail("should throw security exception");
+ } catch (SecurityException e) {
+ }
+ try {
+ // need FilePermission(delete);
+ child1.removeNode();
+ fail("should throw security exception");
+ } catch (SecurityException e) {
+ }
+ try {
+ uroot.childrenNames();
+ fail("should throw security exception");
+ } catch (SecurityException e) {
+ }
+ uroot.keys();
+ uroot.put("securitykey", "value1");
+ uroot.remove("securitykey");
+ try {
+ uroot.flush();
+ fail("should throw security exception");
+ } catch (SecurityException e) {
+ } catch (BackingStoreException e) {
+ assertTrue(e.getCause() instanceof SecurityException);
+ }
+ try {
+ uroot.sync();
+ fail("should throw security exception");
+ } catch (SecurityException e) {
+ } catch (BackingStoreException e) {
+ assertTrue(e.getCause() instanceof SecurityException);
+ }
+ } finally {
+ manager.restoreDefault();
+ }
+ }
+
+ static class MockFileSecurityManager extends SecurityManager {
- }
+ SecurityManager dflt;
+
+ public MockFileSecurityManager() {
+ super();
+ dflt = System.getSecurityManager();
+ }
+
+ public void install() {
+ System.setSecurityManager(this);
+ }
+
+ public void restoreDefault() {
+ System.setSecurityManager(dflt);
+ }
+
+ @Override
+ public void checkPermission(Permission perm) {
+ if (perm instanceof FilePermission) {
+ throw new SecurityException();
+ } else if (dflt != null) {
+ dflt.checkPermission(perm);
+ }
+ }
+
+ @Override
+ public void checkPermission(Permission perm, Object ctx) {
+ if (perm instanceof FilePermission) {
+ System.out.println(perm.getActions());
+ throw new SecurityException();
+ } else if (dflt != null) {
+ dflt.checkPermission(perm, ctx);
+ }
+ }
+
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java Mon Jan 19 21:47:38 2009
@@ -32,7 +32,7 @@
*/
public void testInvalidPreferencesFormatExceptionString() {
InvalidPreferencesFormatException e = new InvalidPreferencesFormatException(
- "msg");
+ "msg");
assertNull(e.getCause());
assertEquals("msg", e.getMessage());
}
@@ -69,7 +69,7 @@
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new InvalidPreferencesFormatException(
- "msg"));
+ "msg"));
}
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java Mon Jan 19 21:47:38 2009
@@ -24,222 +24,231 @@
import java.util.prefs.BackingStoreException;
public class MockAbstractPreferences extends AbstractPreferences {
- static final int NORMAL = 0;
+ static final int NORMAL = 0;
- static final int backingException = 1;
+ static final int backingException = 1;
- static final int runtimeException = 2;
+ static final int runtimeException = 2;
- static final int returnNull = 3;
+ static final int returnNull = 3;
- int result = NORMAL;
-
- Properties attr = new Properties();
-
- Map<String, MockAbstractPreferences> childs = new HashMap<String, MockAbstractPreferences>();
-
- private int flushedTimes;
-
- private int syncTimes;
-
- protected MockAbstractPreferences(AbstractPreferences parent, String name) {
- this(parent, name, false);
-
- }
-
- protected MockAbstractPreferences(AbstractPreferences parent, String name,
- boolean newNode) {
- super(parent, name);
- super.newNode = newNode;
- if (parent instanceof MockAbstractPreferences) {
- ((MockAbstractPreferences) parent).addChild(this);
- }
- }
-
- public int getFlushedTimes() {
- return flushedTimes;
- }
-
- public void resetFlushedTimes() {
- flushedTimes = 0;
- }
-
- public int getSyncTimes() {
- return syncTimes;
- }
-
- public void resetSyncTimes() {
- syncTimes = 0;
- }
-
- private void addChild(MockAbstractPreferences c) {
- childs.put(c.name(), c);
- }
-
- public void setResult(int r) {
- result = r;
- }
-
- public Object lock() {
- return lock;
- }
-
- protected String[] childrenNamesSpi() throws BackingStoreException {
- checkException();
- if (result == returnNull)
- return null;
- String[] r = new String[childs.size()];
- childs.keySet().toArray(r);
- return r;
- }
-
- private void checkException() throws BackingStoreException {
- switch (result) {
- case NORMAL:
- return;
- case backingException:
- throw new BackingStoreException("test");
- case runtimeException:
- throw new MockRuntimeException("test");
- }
- }
-
- public AbstractPreferences publicChildSpi(String name) {
- return childSpi(name);
- }
-
- protected AbstractPreferences childSpi(String name) {
- try {
- checkException();
- } catch (BackingStoreException e) {
- }
- if (result == returnNull)
- return null;
- AbstractPreferences r = childs.get(name);
- if (r == null) {
- r = new MockAbstractPreferences(this, name, true);
-
- }
- return r;
- }
-
- protected void flushSpi() throws BackingStoreException {
- checkException();
- flushedTimes++;
- }
-
- protected String getSpi(String key) {
- try {
- checkException();
- } catch (BackingStoreException e) {
- }
- if (null == key) {
- return null;
- }
- return result == returnNull ? null : attr.getProperty(key);
- }
-
- protected String[] keysSpi() throws BackingStoreException {
- checkException();
- Set<Object> keys = attr.keySet();
- String[] results = new String[keys.size()];
- keys.toArray(results);
- return result == returnNull ? null : results;
- }
-
- protected void putSpi(String name, String value) {
- try {
- checkException();
- } catch (BackingStoreException e) {
- }
- if (name == null || value == null) {
- return;
- }
- attr.put(name, value);
- }
-
- protected void removeNodeSpi() throws BackingStoreException {
- checkException();
- ((MockAbstractPreferences) parent()).childs.remove(name());
- }
-
- protected void removeSpi(String key) {
- try {
- checkException();
- } catch (BackingStoreException e) {
- }
- if (null == key) {
- return;
- }
- attr.remove(key);
- }
-
- protected void syncSpi() throws BackingStoreException {
- checkException();
- syncTimes++;
- }
-
- public boolean getNewNode() {
- return newNode;
- }
-
- public Object getLock() {
- return lock;
- }
-
- public void protectedAbstractMethod() {
- try {
- childrenNamesSpi();
- } catch (BackingStoreException e) {
- }
- childSpi("mock");
- try {
- flushSpi();
- } catch (BackingStoreException e1) {
- }
- getSpi(null);
- isRemoved();
- try {
- keysSpi();
- } catch (BackingStoreException e2) {
- }
- putSpi(null, null);
- try {
- removeNodeSpi();
- } catch (BackingStoreException e3) {
- }
- removeSpi(null);
- try {
- syncSpi();
- } catch (BackingStoreException e4) {
- }
- }
-
- public boolean isRemovedImpl() {
- return super.isRemoved();
- }
-
- public AbstractPreferences getChildImpl(String name)
- throws BackingStoreException {
- return super.getChild(name);
- }
-
- public AbstractPreferences[] cachedChildrenImpl() {
- return super.cachedChildren();
- }
+ int result = NORMAL;
+
+ Properties attr = new Properties();
+
+ Map<String, MockAbstractPreferences> childs = new HashMap<String, MockAbstractPreferences>();
+
+ private int flushedTimes;
+
+ private int syncTimes;
+
+ protected MockAbstractPreferences(AbstractPreferences parent, String name) {
+ this(parent, name, false);
+
+ }
+
+ protected MockAbstractPreferences(AbstractPreferences parent, String name,
+ boolean newNode) {
+ super(parent, name);
+ super.newNode = newNode;
+ if (parent instanceof MockAbstractPreferences) {
+ ((MockAbstractPreferences) parent).addChild(this);
+ }
+ }
+
+ public int getFlushedTimes() {
+ return flushedTimes;
+ }
+
+ public void resetFlushedTimes() {
+ flushedTimes = 0;
+ }
+
+ public int getSyncTimes() {
+ return syncTimes;
+ }
+
+ public void resetSyncTimes() {
+ syncTimes = 0;
+ }
+
+ private void addChild(MockAbstractPreferences c) {
+ childs.put(c.name(), c);
+ }
+
+ public void setResult(int r) {
+ result = r;
+ }
+
+ public Object lock() {
+ return lock;
+ }
+
+ @Override
+ protected String[] childrenNamesSpi() throws BackingStoreException {
+ checkException();
+ if (result == returnNull)
+ return null;
+ String[] r = new String[childs.size()];
+ childs.keySet().toArray(r);
+ return r;
+ }
+
+ private void checkException() throws BackingStoreException {
+ switch (result) {
+ case NORMAL:
+ return;
+ case backingException:
+ throw new BackingStoreException("test");
+ case runtimeException:
+ throw new MockRuntimeException("test");
+ }
+ }
+
+ public AbstractPreferences publicChildSpi(String name) {
+ return childSpi(name);
+ }
+
+ @Override
+ protected AbstractPreferences childSpi(String name) {
+ try {
+ checkException();
+ } catch (BackingStoreException e) {
+ }
+ if (result == returnNull)
+ return null;
+ AbstractPreferences r = childs.get(name);
+ if (r == null) {
+ r = new MockAbstractPreferences(this, name, true);
+
+ }
+ return r;
+ }
+
+ @Override
+ protected void flushSpi() throws BackingStoreException {
+ checkException();
+ flushedTimes++;
+ }
+
+ @Override
+ protected String getSpi(String key) {
+ try {
+ checkException();
+ } catch (BackingStoreException e) {
+ }
+ if (null == key) {
+ return null;
+ }
+ return result == returnNull ? null : attr.getProperty(key);
+ }
+
+ @Override
+ protected String[] keysSpi() throws BackingStoreException {
+ checkException();
+ Set<Object> keys = attr.keySet();
+ String[] results = new String[keys.size()];
+ keys.toArray(results);
+ return result == returnNull ? null : results;
+ }
+
+ @Override
+ protected void putSpi(String name, String value) {
+ try {
+ checkException();
+ } catch (BackingStoreException e) {
+ }
+ if (name == null || value == null) {
+ return;
+ }
+ attr.put(name, value);
+ }
+
+ @Override
+ protected void removeNodeSpi() throws BackingStoreException {
+ checkException();
+ ((MockAbstractPreferences) parent()).childs.remove(name());
+ }
+
+ @Override
+ protected void removeSpi(String key) {
+ try {
+ checkException();
+ } catch (BackingStoreException e) {
+ }
+ if (null == key) {
+ return;
+ }
+ attr.remove(key);
+ }
+
+ @Override
+ protected void syncSpi() throws BackingStoreException {
+ checkException();
+ syncTimes++;
+ }
+
+ public boolean getNewNode() {
+ return newNode;
+ }
+
+ public Object getLock() {
+ return lock;
+ }
+
+ public void protectedAbstractMethod() {
+ try {
+ childrenNamesSpi();
+ } catch (BackingStoreException e) {
+ }
+ childSpi("mock");
+ try {
+ flushSpi();
+ } catch (BackingStoreException e1) {
+ }
+ getSpi(null);
+ isRemoved();
+ try {
+ keysSpi();
+ } catch (BackingStoreException e2) {
+ }
+ putSpi(null, null);
+ try {
+ removeNodeSpi();
+ } catch (BackingStoreException e3) {
+ }
+ removeSpi(null);
+ try {
+ syncSpi();
+ } catch (BackingStoreException e4) {
+ }
+ }
+
+ public boolean isRemovedImpl() {
+ return super.isRemoved();
+ }
+
+ public AbstractPreferences getChildImpl(String name)
+ throws BackingStoreException {
+ return super.getChild(name);
+ }
+
+ public AbstractPreferences[] cachedChildrenImpl() {
+ return super.cachedChildren();
+ }
}
class MockRuntimeException extends RuntimeException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public MockRuntimeException(String s) {
- super(s);
- }
-
- public MockRuntimeException() {
- super();
- }
+ public MockRuntimeException(String s) {
+ super(s);
+ }
+
+ public MockRuntimeException() {
+ super();
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java Mon Jan 19 21:47:38 2009
@@ -23,20 +23,20 @@
*
*/
public class MockPreferencesFactory implements PreferencesFactory {
- static MockAbstractPreferences userRoot = new MockAbstractPreferences(null,
- "");
+ static MockAbstractPreferences userRoot = new MockAbstractPreferences(null,
+ "");
- static MockAbstractPreferences systemRoot = new MockAbstractPreferences(
- null, "");
+ static MockAbstractPreferences systemRoot = new MockAbstractPreferences(
+ null, "");
- public MockPreferencesFactory() {
- }
+ public MockPreferencesFactory() {
+ }
- public Preferences userRoot() {
- return userRoot;
- }
+ public Preferences userRoot() {
+ return userRoot;
+ }
- public Preferences systemRoot() {
- return systemRoot;
- }
+ public Preferences systemRoot() {
+ return systemRoot;
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java Mon Jan 19 21:47:38 2009
@@ -24,37 +24,39 @@
*/
class MockSecurityManager extends SecurityManager {
- SecurityManager dflt;
+ SecurityManager dflt;
- public MockSecurityManager() {
- super();
- dflt = System.getSecurityManager();
- }
-
- public void install() {
- System.setSecurityManager(this);
- }
-
- public void restoreDefault() {
- System.setSecurityManager(dflt);
- }
-
- public void checkPermission(Permission perm) {
- if (perm instanceof RuntimePermission
- && perm.getName().equals("preferences")) {
- throw new SecurityException();
- } else if (dflt != null) {
- dflt.checkPermission(perm);
- }
- }
-
- public void checkPermission(Permission perm, Object ctx) {
- if (perm instanceof RuntimePermission
- && perm.getName().equals("preferences")) {
- throw new SecurityException();
- } else if (dflt != null) {
- dflt.checkPermission(perm, ctx);
- }
- }
+ public MockSecurityManager() {
+ super();
+ dflt = System.getSecurityManager();
+ }
+
+ public void install() {
+ System.setSecurityManager(this);
+ }
+
+ public void restoreDefault() {
+ System.setSecurityManager(dflt);
+ }
+
+ @Override
+ public void checkPermission(Permission perm) {
+ if (perm instanceof RuntimePermission
+ && perm.getName().equals("preferences")) {
+ throw new SecurityException();
+ } else if (dflt != null) {
+ dflt.checkPermission(perm);
+ }
+ }
+
+ @Override
+ public void checkPermission(Permission perm, Object ctx) {
+ if (perm instanceof RuntimePermission
+ && perm.getName().equals("preferences")) {
+ throw new SecurityException();
+ } else if (dflt != null) {
+ dflt.checkPermission(perm, ctx);
+ }
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java Mon Jan 19 21:47:38 2009
@@ -27,41 +27,43 @@
*/
public class NodeChangeListenerTest extends TestCase {
- NodeChangeListener l;
+ NodeChangeListener l;
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- l = new NodeChangeListenerImpl();
- }
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testChildAdded() {
- l.childAdded(new NodeChangeEvent(Preferences.userRoot(), Preferences
- .userRoot()));
- }
-
- public void testChildRemoved() {
- l.childRemoved(new NodeChangeEvent(Preferences.userRoot(), Preferences
- .userRoot()));
- }
-
- public static class NodeChangeListenerImpl implements NodeChangeListener {
+ /*
+ * @see TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ l = new NodeChangeListenerImpl();
+ }
+
+ /*
+ * @see TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testChildAdded() {
+ l.childAdded(new NodeChangeEvent(Preferences.userRoot(), Preferences
+ .userRoot()));
+ }
+
+ public void testChildRemoved() {
+ l.childRemoved(new NodeChangeEvent(Preferences.userRoot(), Preferences
+ .userRoot()));
+ }
+
+ public static class NodeChangeListenerImpl implements NodeChangeListener {
- public void childAdded(NodeChangeEvent e) {
- }
+ public void childAdded(NodeChangeEvent e) {
+ }
- public void childRemoved(NodeChangeEvent e) {
- }
+ public void childRemoved(NodeChangeEvent e) {
+ }
- }
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java Mon Jan 19 21:47:38 2009
@@ -67,7 +67,7 @@
public void testConstructor() {
event = new PreferenceChangeEvent(Preferences.userRoot(), "key",
- "value");
+ "value");
assertEquals("key", event.getKey());
assertEquals("value", event.getNewValue());
assertSame(Preferences.userRoot(), event.getNode());
@@ -76,7 +76,7 @@
public void testSerialization() throws Exception {
event = new PreferenceChangeEvent(Preferences.userRoot(), "key",
- "value");
+ "value");
try {
SerializationTest.copySerializable(event);
fail("No expected NotSerializableException");
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java Mon Jan 19 21:47:38 2009
@@ -27,26 +27,27 @@
*/
public class PreferenceChangeListenerTest extends TestCase {
- PreferenceChangeListener l;
+ PreferenceChangeListener l;
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- l = new PreferenceChangeListenerImpl();
- }
-
- public void testPreferenceChange() {
- l.preferenceChange(new PreferenceChangeEvent(Preferences.userRoot(),
- "", ""));
- }
-
- public static class PreferenceChangeListenerImpl implements
- PreferenceChangeListener {
- public void preferenceChange(PreferenceChangeEvent pce) {
- }
+ /*
+ * @see TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ l = new PreferenceChangeListenerImpl();
+ }
+
+ public void testPreferenceChange() {
+ l.preferenceChange(new PreferenceChangeEvent(Preferences.userRoot(),
+ "", ""));
+ }
+
+ public static class PreferenceChangeListenerImpl implements
+ PreferenceChangeListener {
+ public void preferenceChange(PreferenceChangeEvent pce) {
+ }
- }
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java Mon Jan 19 21:47:38 2009
@@ -26,34 +26,35 @@
*/
public class PreferencesFactoryTest extends TestCase {
- PreferencesFactory f;
+ PreferencesFactory f;
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- f = new PreferencesFactoryImpl();
- }
-
- public void testUserRoot() {
- f.userRoot();
- }
-
- public void testSystemRoot() {
- f.systemRoot();
- }
-
- public static class PreferencesFactoryImpl implements PreferencesFactory {
-
- public Preferences userRoot() {
- return null;
- }
-
- public Preferences systemRoot() {
- return null;
- }
+ /*
+ * @see TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ f = new PreferencesFactoryImpl();
+ }
+
+ public void testUserRoot() {
+ f.userRoot();
+ }
+
+ public void testSystemRoot() {
+ f.systemRoot();
+ }
+
+ public static class PreferencesFactoryImpl implements PreferencesFactory {
+
+ public Preferences userRoot() {
+ return null;
+ }
+
+ public Preferences systemRoot() {
+ return null;
+ }
- }
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java Mon Jan 19 21:47:38 2009
@@ -35,46 +35,48 @@
*/
public class PreferencesTest extends TestCase {
- MockSecurityManager manager = new MockSecurityManager();
+ MockSecurityManager manager = new MockSecurityManager();
- MockInputStream stream = null;
+ MockInputStream stream = null;
- InputStream in;
+ InputStream in;
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- in = new ByteArrayInputStream("<!DOCTYPE preferences SYSTEM \"http://java.sun.com/dtd/preferences.dtd\"><preferences><root type=\"user\"><map></map></root></preferences>".getBytes("UTF-8"));
- stream = new MockInputStream(in);
- }
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- stream.close();
- }
+ /*
+ * @see TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ in = new ByteArrayInputStream("<!DOCTYPE preferences SYSTEM \"http://java.sun.com/dtd/preferences.dtd\"><preferences><root type=\"user\"><map></map></root></preferences>".getBytes("UTF-8"));
+ stream = new MockInputStream(in);
+ }
+
+ /*
+ * @see TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ stream.close();
+ }
- public void testSystemNodeForPackage() throws BackingStoreException {
- Preferences p = null;
+ public void testSystemNodeForPackage() throws BackingStoreException {
+ Preferences p = null;
try {
p = Preferences.systemNodeForPackage(Object.class);
} catch (SecurityException e) {
// may be caused by absence of privileges on the underlying OS
return;
}
- assertEquals("/java/lang", p.absolutePath());
- assertTrue(p instanceof AbstractPreferences);
- Preferences root = Preferences.systemRoot();
- Preferences parent = root.node("java");
- assertSame(parent, p.parent());
- assertFalse(p.isUserNode());
- assertEquals("lang", p.name());
- assertEquals("System Preference Node: " + p.absolutePath(), p
- .toString());
+ assertEquals("/java/lang", p.absolutePath());
+ assertTrue(p instanceof AbstractPreferences);
+ Preferences root = Preferences.systemRoot();
+ Preferences parent = root.node("java");
+ assertSame(parent, p.parent());
+ assertFalse(p.isUserNode());
+ assertEquals("lang", p.name());
+ assertEquals("System Preference Node: " + p.absolutePath(), p
+ .toString());
try {
assertEquals(0, p.childrenNames().length);
} catch (BackingStoreException e) {
@@ -96,434 +98,469 @@
} catch (NullPointerException e) {
// expected
}
- }
+ }
- public void testSystemRoot() throws BackingStoreException {
- Preferences p = Preferences.systemRoot();
- assertTrue(p instanceof AbstractPreferences);
- assertEquals("/", p.absolutePath());
- assertSame(null, p.parent());
- assertFalse(p.isUserNode());
- assertEquals("", p.name());
- assertEquals("System Preference Node: " + p.absolutePath(), p
- .toString());
- // assertEquals(0, p.childrenNames().length);
- // assertEquals(0, p.keys().length);
- }
-
- public void testConsts() {
- assertEquals(80, Preferences.MAX_KEY_LENGTH);
- assertEquals(80, Preferences.MAX_NAME_LENGTH);
- assertEquals(8192, Preferences.MAX_VALUE_LENGTH);
- }
-
- public void testUserNodeForPackage() throws BackingStoreException {
- Preferences p = Preferences.userNodeForPackage(Object.class);
- assertEquals("/java/lang", p.absolutePath());
- assertTrue(p instanceof AbstractPreferences);
- Preferences root = Preferences.userRoot();
- Preferences parent = root.node("java");
- assertSame(parent, p.parent());
- assertTrue(p.isUserNode());
- assertEquals("lang", p.name());
- assertEquals("User Preference Node: " + p.absolutePath(), p.toString());
- assertEquals(0, p.childrenNames().length);
- assertEquals(0, p.keys().length);
-
- try {
- p = Preferences.userNodeForPackage(null);
- fail();
- } catch (NullPointerException e) {
- }
- }
-
- public void testUserRoot() throws BackingStoreException {
- Preferences p = Preferences.userRoot();
- assertTrue(p instanceof AbstractPreferences);
- assertEquals("/", p.absolutePath());
- assertSame(null, p.parent());
- assertTrue(p.isUserNode());
- assertEquals("", p.name());
- assertEquals("User Preference Node: " + p.absolutePath(), p.toString());
- // assertEquals(0, p.childrenNames().length);
- // assertEquals(p.keys().length, 0);
- }
-
- public void testImportPreferences() throws Exception {
- Preferences prefs = null;
- try {
- prefs = Preferences.userNodeForPackage(PreferencesTest.class);
- // assertEquals(0, prefs.childrenNames().length);
- // assertFalse(prefs.nodeExists("mock/child/grandson"));
-
- prefs.put("prefskey", "oldvalue");
- prefs.put("prefskey2", "oldvalue2");
- in = PreferencesTest.class.getResourceAsStream("/prefs/java/util/prefs/userprefs.xml");
- Preferences.importPreferences(in);
-
- prefs = Preferences.userNodeForPackage(PreferencesTest.class);
- assertEquals(1, prefs.childrenNames().length);
- assertTrue(prefs.nodeExists("mock/child/grandson"));
- assertEquals("newvalue", prefs.get("prefskey", null));
- assertEquals("oldvalue2", prefs.get("prefskey2", null));
- assertEquals("newvalue3", prefs.get("prefskey3", null));
-
- in = PreferencesTest.class
- .getResourceAsStream("/prefs/java/util/prefs/userprefs-badform.xml");
- try {
- Preferences.importPreferences(in);
- fail();
- } catch (InvalidPreferencesFormatException e) {
- }
-
- in = PreferencesTest.class
- .getResourceAsStream("/prefs/java/util/prefs/userprefs-badtype.xml");
- try {
- Preferences.importPreferences(in);
- fail();
- } catch (InvalidPreferencesFormatException e) {
- }
-
- in = PreferencesTest.class
- .getResourceAsStream("/prefs/java/util/prefs/userprefs-badencoding.xml");
- try {
- Preferences.importPreferences(in);
- fail();
- } catch (InvalidPreferencesFormatException e) {
- }
-
- in = PreferencesTest.class
- .getResourceAsStream("/prefs/java/util/prefs/userprefs-higherversion.xml");
- try {
- Preferences.importPreferences(in);
- fail();
- } catch (InvalidPreferencesFormatException e) {
- }
-
- in = PreferencesTest.class
- .getResourceAsStream("/prefs/java/util/prefs/userprefs-ascii.xml");
- Preferences.importPreferences(in);
- prefs = Preferences.userNodeForPackage(PreferencesTest.class);
- } finally {
- try {
- prefs = Preferences.userRoot().node("tests");
- prefs.removeNode();
- } catch (Exception e) {
- }
- }
- }
-
- public void testImportPreferencesException() throws Exception {
- try {
- Preferences.importPreferences(null);
- fail();
- } catch (MalformedURLException e) {
- }
-
- byte[] source = new byte[0];
- InputStream in = new ByteArrayInputStream(source);
- try {
- Preferences.importPreferences(in);
- fail();
- } catch (InvalidPreferencesFormatException e) {
- }
-
- stream.setResult(MockInputStream.exception);
- try {
- Preferences.importPreferences(stream);
- fail();
- } catch (IOException e) {
- }
-
- stream.setResult(MockInputStream.runtimeException);
- try {
- Preferences.importPreferences(stream);
- fail();
- } catch (RuntimeException e) {
- }
- }
-
- public void testSecurity() throws InvalidPreferencesFormatException,
- IOException {
- try {
- manager.install();
- try {
- Preferences.userRoot();
- fail();
- } catch (SecurityException e) {
- }
- try {
- Preferences.systemRoot();
- fail();
- } catch (SecurityException e) {
- }
- try {
- Preferences.userNodeForPackage(null);
- fail();
- } catch (SecurityException e) {
- }
-
- try {
- Preferences.systemNodeForPackage(null);
- fail();
- } catch (SecurityException e) {
- }
-
- try {
- Preferences.importPreferences(stream);
- fail();
- } catch (SecurityException e) {
- }
- } finally {
- manager.restoreDefault();
- }
- }
-
- public void testAbstractMethods() {
- Preferences p = new MockPreferences();
- p.absolutePath();
- try {
- p.childrenNames();
- } catch (BackingStoreException e4) {
- }
- try {
- p.clear();
- } catch (BackingStoreException e5) {
- }
- try {
- p.exportNode(null);
- } catch (IOException e6) {
- } catch (BackingStoreException e6) {
- }
- try {
- p.exportSubtree(null);
- } catch (IOException e7) {
- } catch (BackingStoreException e7) {
- }
- try {
- p.flush();
- } catch (BackingStoreException e8) {
- }
- p.get(null, null);
- p.getBoolean(null, false);
- p.getByteArray(null, null);
- p.getFloat(null, 0.1f);
- p.getDouble(null, 0.1);
- p.getInt(null, 1);
- p.getLong(null, 1l);
- p.isUserNode();
- try {
- p.keys();
- } catch (BackingStoreException e) {
- }
- p.name();
- p.node(null);
- try {
- p.nodeExists(null);
- } catch (BackingStoreException e1) {
- }
- p.parent();
- p.put(null, null);
- p.putBoolean(null, false);
- p.putByteArray(null, null);
- p.putDouble(null, 1);
- p.putFloat(null, 1f);
- p.putInt(null, 1);
- p.putLong(null, 1l);
- p.remove(null);
- try {
- p.removeNode();
- } catch (BackingStoreException e2) {
- }
- p.addNodeChangeListener(null);
- p.addPreferenceChangeListener(null);
- p.removeNodeChangeListener(null);
- p.removePreferenceChangeListener(null);
- try {
- p.sync();
- } catch (BackingStoreException e3) {
- }
- p.toString();
- }
-
- static class MockInputStream extends InputStream {
-
- static final int normal = 0;
-
- static final int exception = 1;
-
- static final int runtimeException = 2;
-
- int result = normal;
-
- InputStream wrapper;
-
- public void setResult(int i) {
- result = i;
- }
-
- private void checkException() throws IOException {
- switch (result) {
- case normal:
- return;
- case exception:
- throw new IOException("test");
- case runtimeException:
- throw new RuntimeException("test");
- }
- }
-
- public MockInputStream(InputStream in) {
- wrapper = in;
- }
-
- public int read() throws IOException {
- checkException();
- return wrapper.read();
- }
- }
-
- static class MockPreferences extends Preferences {
-
- public MockPreferences() {
- super();
- }
-
- public String absolutePath() {
- return null;
- }
-
- public String[] childrenNames() throws BackingStoreException {
- return null;
- }
-
- public void clear() throws BackingStoreException {
- }
-
- public void exportNode(OutputStream ostream) throws IOException,
- BackingStoreException {
- }
-
- public void exportSubtree(OutputStream ostream) throws IOException,
- BackingStoreException {
- }
-
- public void flush() throws BackingStoreException {
- }
-
- public String get(String key, String deflt) {
- return null;
- }
-
- public boolean getBoolean(String key, boolean deflt) {
- return false;
- }
-
- public byte[] getByteArray(String key, byte[] deflt) {
- return null;
- }
-
- public double getDouble(String key, double deflt) {
- return 0;
- }
-
- public float getFloat(String key, float deflt) {
- return 0;
- }
-
- public int getInt(String key, int deflt) {
- return 0;
- }
-
- public long getLong(String key, long deflt) {
- return 0;
- }
-
- public boolean isUserNode() {
- return false;
- }
-
- public String[] keys() throws BackingStoreException {
- return null;
- }
-
- public String name() {
- return null;
- }
-
- public Preferences node(String name) {
- return null;
- }
-
- public boolean nodeExists(String name) throws BackingStoreException {
- return false;
- }
-
- public Preferences parent() {
- return null;
- }
-
- public void put(String key, String value) {
-
- }
-
- public void putBoolean(String key, boolean value) {
-
- }
-
- public void putByteArray(String key, byte[] value) {
-
- }
-
- public void putDouble(String key, double value) {
-
- }
-
- public void putFloat(String key, float value) {
-
- }
-
- public void putInt(String key, int value) {
-
- }
-
- public void putLong(String key, long value) {
-
- }
-
- public void remove(String key) {
-
- }
-
- public void removeNode() throws BackingStoreException {
-
- }
-
- public void addNodeChangeListener(NodeChangeListener ncl) {
-
- }
-
- public void addPreferenceChangeListener(PreferenceChangeListener pcl) {
-
- }
-
- public void removeNodeChangeListener(NodeChangeListener ncl) {
-
- }
-
- public void removePreferenceChangeListener(PreferenceChangeListener pcl) {
-
- }
-
- public void sync() throws BackingStoreException {
-
- }
-
- public String toString() {
- return null;
- }
+ public void testSystemRoot() throws BackingStoreException {
+ Preferences p = Preferences.systemRoot();
+ assertTrue(p instanceof AbstractPreferences);
+ assertEquals("/", p.absolutePath());
+ assertSame(null, p.parent());
+ assertFalse(p.isUserNode());
+ assertEquals("", p.name());
+ assertEquals("System Preference Node: " + p.absolutePath(), p
+ .toString());
+ // assertEquals(0, p.childrenNames().length);
+ // assertEquals(0, p.keys().length);
+ }
+
+ public void testConsts() {
+ assertEquals(80, Preferences.MAX_KEY_LENGTH);
+ assertEquals(80, Preferences.MAX_NAME_LENGTH);
+ assertEquals(8192, Preferences.MAX_VALUE_LENGTH);
+ }
+
+ public void testUserNodeForPackage() throws BackingStoreException {
+ Preferences p = Preferences.userNodeForPackage(Object.class);
+ assertEquals("/java/lang", p.absolutePath());
+ assertTrue(p instanceof AbstractPreferences);
+ Preferences root = Preferences.userRoot();
+ Preferences parent = root.node("java");
+ assertSame(parent, p.parent());
+ assertTrue(p.isUserNode());
+ assertEquals("lang", p.name());
+ assertEquals("User Preference Node: " + p.absolutePath(), p.toString());
+ assertEquals(0, p.childrenNames().length);
+ assertEquals(0, p.keys().length);
- }
+ try {
+ p = Preferences.userNodeForPackage(null);
+ fail();
+ } catch (NullPointerException e) {
+ }
+ }
+
+ public void testUserRoot() throws BackingStoreException {
+ Preferences p = Preferences.userRoot();
+ assertTrue(p instanceof AbstractPreferences);
+ assertEquals("/", p.absolutePath());
+ assertSame(null, p.parent());
+ assertTrue(p.isUserNode());
+ assertEquals("", p.name());
+ assertEquals("User Preference Node: " + p.absolutePath(), p.toString());
+ // assertEquals(0, p.childrenNames().length);
+ // assertEquals(p.keys().length, 0);
+ }
+
+ public void testImportPreferences() throws Exception {
+ Preferences prefs = null;
+ try {
+ prefs = Preferences.userNodeForPackage(PreferencesTest.class);
+ // assertEquals(0, prefs.childrenNames().length);
+ // assertFalse(prefs.nodeExists("mock/child/grandson"));
+
+ prefs.put("prefskey", "oldvalue");
+ prefs.put("prefskey2", "oldvalue2");
+ in = PreferencesTest.class.getResourceAsStream("/prefs/java/util/prefs/userprefs.xml");
+ Preferences.importPreferences(in);
+
+ prefs = Preferences.userNodeForPackage(PreferencesTest.class);
+ assertEquals(1, prefs.childrenNames().length);
+ assertTrue(prefs.nodeExists("mock/child/grandson"));
+ assertEquals("newvalue", prefs.get("prefskey", null));
+ assertEquals("oldvalue2", prefs.get("prefskey2", null));
+ assertEquals("newvalue3", prefs.get("prefskey3", null));
+
+ in = PreferencesTest.class
+ .getResourceAsStream("/prefs/java/util/prefs/userprefs-badform.xml");
+ try {
+ Preferences.importPreferences(in);
+ fail();
+ } catch (InvalidPreferencesFormatException e) {
+ }
+
+ in = PreferencesTest.class
+ .getResourceAsStream("/prefs/java/util/prefs/userprefs-badtype.xml");
+ try {
+ Preferences.importPreferences(in);
+ fail();
+ } catch (InvalidPreferencesFormatException e) {
+ }
+
+ in = PreferencesTest.class
+ .getResourceAsStream("/prefs/java/util/prefs/userprefs-badencoding.xml");
+ try {
+ Preferences.importPreferences(in);
+ fail();
+ } catch (InvalidPreferencesFormatException e) {
+ }
+
+ in = PreferencesTest.class
+ .getResourceAsStream("/prefs/java/util/prefs/userprefs-higherversion.xml");
+ try {
+ Preferences.importPreferences(in);
+ fail();
+ } catch (InvalidPreferencesFormatException e) {
+ }
+
+ in = PreferencesTest.class
+ .getResourceAsStream("/prefs/java/util/prefs/userprefs-ascii.xml");
+ Preferences.importPreferences(in);
+ prefs = Preferences.userNodeForPackage(PreferencesTest.class);
+ } finally {
+ try {
+ prefs = Preferences.userRoot().node("tests");
+ prefs.removeNode();
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ public void testImportPreferencesException() throws Exception {
+ try {
+ Preferences.importPreferences(null);
+ fail();
+ } catch (MalformedURLException e) {
+ }
+
+ byte[] source = new byte[0];
+ InputStream in = new ByteArrayInputStream(source);
+ try {
+ Preferences.importPreferences(in);
+ fail();
+ } catch (InvalidPreferencesFormatException e) {
+ }
+
+ stream.setResult(MockInputStream.exception);
+ try {
+ Preferences.importPreferences(stream);
+ fail();
+ } catch (IOException e) {
+ }
+
+ stream.setResult(MockInputStream.runtimeException);
+ try {
+ Preferences.importPreferences(stream);
+ fail();
+ } catch (RuntimeException e) {
+ }
+ }
+
+ public void testSecurity() throws InvalidPreferencesFormatException,
+ IOException {
+ try {
+ manager.install();
+ try {
+ Preferences.userRoot();
+ fail();
+ } catch (SecurityException e) {
+ }
+ try {
+ Preferences.systemRoot();
+ fail();
+ } catch (SecurityException e) {
+ }
+ try {
+ Preferences.userNodeForPackage(null);
+ fail();
+ } catch (SecurityException e) {
+ }
+
+ try {
+ Preferences.systemNodeForPackage(null);
+ fail();
+ } catch (SecurityException e) {
+ }
+
+ try {
+ Preferences.importPreferences(stream);
+ fail();
+ } catch (SecurityException e) {
+ }
+ } finally {
+ manager.restoreDefault();
+ }
+ }
+
+ public void testAbstractMethods() {
+ Preferences p = new MockPreferences();
+ p.absolutePath();
+ try {
+ p.childrenNames();
+ } catch (BackingStoreException e4) {
+ }
+ try {
+ p.clear();
+ } catch (BackingStoreException e5) {
+ }
+ try {
+ p.exportNode(null);
+ } catch (IOException e6) {
+ } catch (BackingStoreException e6) {
+ }
+ try {
+ p.exportSubtree(null);
+ } catch (IOException e7) {
+ } catch (BackingStoreException e7) {
+ }
+ try {
+ p.flush();
+ } catch (BackingStoreException e8) {
+ }
+ p.get(null, null);
+ p.getBoolean(null, false);
+ p.getByteArray(null, null);
+ p.getFloat(null, 0.1f);
+ p.getDouble(null, 0.1);
+ p.getInt(null, 1);
+ p.getLong(null, 1l);
+ p.isUserNode();
+ try {
+ p.keys();
+ } catch (BackingStoreException e) {
+ }
+ p.name();
+ p.node(null);
+ try {
+ p.nodeExists(null);
+ } catch (BackingStoreException e1) {
+ }
+ p.parent();
+ p.put(null, null);
+ p.putBoolean(null, false);
+ p.putByteArray(null, null);
+ p.putDouble(null, 1);
+ p.putFloat(null, 1f);
+ p.putInt(null, 1);
+ p.putLong(null, 1l);
+ p.remove(null);
+ try {
+ p.removeNode();
+ } catch (BackingStoreException e2) {
+ }
+ p.addNodeChangeListener(null);
+ p.addPreferenceChangeListener(null);
+ p.removeNodeChangeListener(null);
+ p.removePreferenceChangeListener(null);
+ try {
+ p.sync();
+ } catch (BackingStoreException e3) {
+ }
+ p.toString();
+ }
+
+ static class MockInputStream extends InputStream {
+
+ static final int normal = 0;
+
+ static final int exception = 1;
+
+ static final int runtimeException = 2;
+
+ int result = normal;
+
+ InputStream wrapper;
+
+ public void setResult(int i) {
+ result = i;
+ }
+
+ private void checkException() throws IOException {
+ switch (result) {
+ case normal:
+ return;
+ case exception:
+ throw new IOException("test");
+ case runtimeException:
+ throw new RuntimeException("test");
+ }
+ }
+
+ public MockInputStream(InputStream in) {
+ wrapper = in;
+ }
+
+ @Override
+ public int read() throws IOException {
+ checkException();
+ return wrapper.read();
+ }
+ }
+
+ static class MockPreferences extends Preferences {
+
+ public MockPreferences() {
+ super();
+ }
+
+ @Override
+ public String absolutePath() {
+ return null;
+ }
+
+ @Override
+ public String[] childrenNames() throws BackingStoreException {
+ return null;
+ }
+
+ @Override
+ public void clear() throws BackingStoreException {
+ }
+
+ @Override
+ public void exportNode(OutputStream ostream) throws IOException,
+ BackingStoreException {
+ }
+
+ @Override
+ public void exportSubtree(OutputStream ostream) throws IOException,
+ BackingStoreException {
+ }
+
+ @Override
+ public void flush() throws BackingStoreException {
+ }
+
+ @Override
+ public String get(String key, String deflt) {
+ return null;
+ }
+
+ @Override
+ public boolean getBoolean(String key, boolean deflt) {
+ return false;
+ }
+
+ @Override
+ public byte[] getByteArray(String key, byte[] deflt) {
+ return null;
+ }
+
+ @Override
+ public double getDouble(String key, double deflt) {
+ return 0;
+ }
+
+ @Override
+ public float getFloat(String key, float deflt) {
+ return 0;
+ }
+
+ @Override
+ public int getInt(String key, int deflt) {
+ return 0;
+ }
+
+ @Override
+ public long getLong(String key, long deflt) {
+ return 0;
+ }
+
+ @Override
+ public boolean isUserNode() {
+ return false;
+ }
+
+ @Override
+ public String[] keys() throws BackingStoreException {
+ return null;
+ }
+
+ @Override
+ public String name() {
+ return null;
+ }
+
+ @Override
+ public Preferences node(String name) {
+ return null;
+ }
+
+ @Override
+ public boolean nodeExists(String name) throws BackingStoreException {
+ return false;
+ }
+
+ @Override
+ public Preferences parent() {
+ return null;
+ }
+
+ @Override
+ public void put(String key, String value) {
+
+ }
+
+ @Override
+ public void putBoolean(String key, boolean value) {
+
+ }
+
+ @Override
+ public void putByteArray(String key, byte[] value) {
+
+ }
+
+ @Override
+ public void putDouble(String key, double value) {
+
+ }
+
+ @Override
+ public void putFloat(String key, float value) {
+
+ }
+
+ @Override
+ public void putInt(String key, int value) {
+
+ }
+
+ @Override
+ public void putLong(String key, long value) {
+
+ }
+
+ @Override
+ public void remove(String key) {
+
+ }
+
+ @Override
+ public void removeNode() throws BackingStoreException {
+
+ }
+
+ @Override
+ public void addNodeChangeListener(NodeChangeListener ncl) {
+
+ }
+
+ @Override
+ public void addPreferenceChangeListener(PreferenceChangeListener pcl) {
+
+ }
+
+ @Override
+ public void removeNodeChangeListener(NodeChangeListener ncl) {
+
+ }
+
+ @Override
+ public void removePreferenceChangeListener(PreferenceChangeListener pcl) {
+
+ }
+
+ @Override
+ public void sync() throws BackingStoreException {
+
+ }
+
+ @Override
+ public String toString() {
+ return null;
+ }
+
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/UnresolvedPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/UnresolvedPermission.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/UnresolvedPermission.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/UnresolvedPermission.java Mon Jan 19 21:47:38 2009
@@ -83,7 +83,10 @@
this.type = type;
this.name = name;
this.actions = actions;
- this.targetCerts = certs;
+ if (certs != null) {
+ this.targetCerts = new Certificate[certs.length];
+ System.arraycopy(certs, 0, targetCerts, 0, certs.length);
+ }
hash = 0;
}
@@ -133,7 +136,7 @@
return false;
}
- /*
+ /**
* check whether given array of certificates are equivalent
*/
private boolean equalsCertificates(Certificate[] certs1,
@@ -150,6 +153,10 @@
if (length > 0) {
boolean found;
for (int i = 0; i < length; i++) {
+ // Skip the checking for null
+ if(certs1[i] == null){
+ continue;
+ }
found = false;
for (int j = 0; j < length; j++) {
if (certs1[i].equals(certs2[j])) {
@@ -164,6 +171,9 @@
}
for (int i = 0; i < length; i++) {
+ if(certs2[i] == null){
+ continue;
+ }
found = false;
for (int j = 0; j < length; j++) {
if (certs2[i].equals(certs1[j])) {
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java.injected/java/security/UnresolvedPermission_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java.injected/java/security/UnresolvedPermission_ImplTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java.injected/java/security/UnresolvedPermission_ImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java.injected/java/security/UnresolvedPermission_ImplTest.java Mon Jan 19 21:47:38 2009
@@ -217,11 +217,23 @@
new java.security.cert.Certificate[2]);
UnresolvedPermission up2 = new UnresolvedPermission(type, name, action,
new java.security.cert.Certificate[2]);
- try {
- up1.equals(up2);
- fail("should throw NullPointerException");
- } catch (NullPointerException e) {
- // Expected
- }
+ // Non-bug difference, RI throw NPE here.
+ assertEquals(up1, up2);
+ }
+
+ public void test_Equals_Scenario11() {
+ UnresolvedPermission up1 = new UnresolvedPermission(type, name, action,
+ new java.security.cert.Certificate[] { cert1, cert2 });
+ UnresolvedPermission up2 = new UnresolvedPermission(type, name, action,
+ new java.security.cert.Certificate[] { cert1, null, cert2 });
+ assertFalse(up1.equals(up2));
+ }
+
+ public void test_Equals_Scenario12() {
+ UnresolvedPermission up1 = new UnresolvedPermission(type, name, action,
+ new java.security.cert.Certificate[] { cert1, null, null });
+ UnresolvedPermission up2 = new UnresolvedPermission(type, name, action,
+ new java.security.cert.Certificate[] { cert1, null, cert1 });
+ assertEquals(up1, up2);
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java Mon Jan 19 21:47:38 2009
@@ -95,7 +95,7 @@
* Now set the time for this Timestamp object - which deals with the
* nanosecond value as well as the base time
*/
- this.setTime(theTime);
+ setTimeImpl(theTime);
}
/**
@@ -292,6 +292,10 @@
*/
@Override
public void setTime(long theTime) {
+ setTimeImpl(theTime);
+ }
+
+ private void setTimeImpl(long theTime) {
/*
* Deal with the nanoseconds value. The supplied time is in milliseconds -
* so we must extract the milliseconds value and multiply by 1000000 to
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java Mon Jan 19 21:47:38 2009
@@ -30,6 +30,22 @@
*/
public class TimestampTest extends TestCase {
+
+ static class MockTimestamp extends Timestamp{
+ private String holiday;
+
+ public MockTimestamp(long theTime) {
+ super(theTime);
+ holiday = "Christmas";
+ }
+
+ // Constructor should not call this public API,
+ // since it may be overrided to use variables uninitialized.
+ public void setTime(long theTime){
+ super.setTime(theTime);
+ holiday.hashCode();
+ }
+ }
static long TIME_TEST1 = 38720231; // 10:45:20.231 GMT
@@ -121,9 +137,11 @@
*/
public void testTimestamplong() {
Timestamp theTimestamp = new Timestamp(TIME_TEST1);
-
// The Timestamp should have been created
assertNotNull(theTimestamp);
+
+ Timestamp mockTimestamp = new MockTimestamp(TIME_TEST1);
+ assertNotNull(theTimestamp);
} // end method testTimestamplong
/*
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLContext.java?rev=735939&r1=735938&r2=735939&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLContext.java Mon Jan 19 21:47:38 2009
@@ -45,10 +45,6 @@
// Storeused protocol
private final String protocol;
- /*
- * @com.intel.drl.spec_ref
- *
- */
protected SSLContext(SSLContextSpi contextSpi, Provider provider,
String protocol) {
this.provider = provider;
@@ -108,8 +104,8 @@
return new SSLContext((SSLContextSpi) engine.spi, provider, protocol);
}
}
-
- public final String getProtocol() {
+
+ public final String getProtocol() {
return protocol;
}
@@ -169,4 +165,4 @@
"setDefaultSSLContext"));
defaultSSLContext = sslContext;
}
-}
\ No newline at end of file
+}