# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /space/work/allprefs # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: core/startup/test/unit/src/org/netbeans/core/startup/preferences/NbPreferencesTest.java *** /space/work/allprefs/core/startup/test/unit/src/org/netbeans/core/startup/preferences/NbPreferencesTest.java Base (1.2) --- /space/work/allprefs/core/startup/test/unit/src/org/netbeans/core/startup/preferences/NbPreferencesTest.java Locally Modified (Based On 1.2) *************** *** 19,27 **** package org.netbeans.core.startup.preferences; import junit.framework.Test; import junit.framework.TestSuite; - import org.netbeans.junit.MockServices; import org.netbeans.junit.NbTestCase; /** --- 19,31 ---- package org.netbeans.core.startup.preferences; + import java.util.prefs.Preferences; import junit.framework.Test; + import junit.framework.TestResult; import junit.framework.TestSuite; import org.netbeans.junit.NbTestCase; *************** *** 48,53 **** --- 49,60 ---- super(testName); } + public void run(final TestResult result) { + //just do registration before code NbTestCase + NbPreferencesFactory.doRegistration(); + Preferences.userRoot(); + super.run(result); + } protected void tearDown() throws Exception { super.tearDown(); *************** *** 61,67 **** protected void setUp() throws Exception { super.setUp(); - NbPreferencesFactory.doRegistration(); Statistics.CHILDREN_NAMES.reset(); Statistics.FLUSH.reset(); Statistics.LOAD.reset(); --- 68,73 ---- Index: xtest/nbjunit/src/org/netbeans/junit/NbTestCase.java *** /space/work/allprefs/xtest/nbjunit/src/org/netbeans/junit/NbTestCase.java Base (1.57) --- /space/work/allprefs/xtest/nbjunit/src/org/netbeans/junit/NbTestCase.java Locally Modified (Based On 1.57) *************** *** 154,159 **** --- 154,161 ---- */ public void run(final TestResult result) { if (canRun()) { + System.setProperty("java.util.prefs.PreferencesFactory", + MemoryPreferencesFactory.class.getName());//NOI18N Level lev = logLevel(); if (lev != null) { Log.configure(lev, NbTestCase.this); Index: xtest/nbjunit/test/unit/src/org/netbeans/junit/NbTestCaseTest.java *** /space/work/allprefs/xtest/nbjunit/test/unit/src/org/netbeans/junit/NbTestCaseTest.java Base (1.5) --- /space/work/allprefs/xtest/nbjunit/test/unit/src/org/netbeans/junit/NbTestCaseTest.java Locally Modified (Based On 1.5) *************** *** 22,27 **** --- 22,28 ---- import java.lang.ref.WeakReference; import java.util.logging.Level; import java.util.logging.Logger; + import java.util.prefs.Preferences; import junit.framework.TestResult; /** Regular test of the behaviour. *************** *** 61,66 **** --- 62,75 ---- } + public void testNotPersistentPreferences() throws Exception { + Preferences pref = Preferences.userNodeForPackage(getClass()); + assertNotNull(pref); + pref.put("key", "value"); + assertEquals("value", pref.get("key", null)); + pref.sync(); + assertEquals(null, pref.get("key", null)); + } public void testLoggingUtil() throws Exception { CharSequence seq = Log.enable("", Level.WARNING);