From af25831c2e904c80cdc3df827c19ec1551b1eaed Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 11 Apr 2004 01:09:03 +0000
Subject: [PATCH] M webclient/build-tests.xml

- re-activate some tests

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java

- Make null an acceptable argument for prefValue.  Make it mean, remove
  the pref.

M webclient/src_moz/PreferencesImpl.cpp

- make a null prefValue argument to nativeSetUnicharPref mean, ClearPref().


git-svn-id: svn://10.0.0.236/trunk@154682 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/java/webclient/build-tests.xml        |  2 +-
 .../impl/wrapper_native/PreferencesImpl.java  |  6 ++--
 .../webclient/src_moz/PreferencesImpl.cpp     | 32 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/mozilla/java/webclient/build-tests.xml b/mozilla/java/webclient/build-tests.xml
index 00ac8428b17..2eb6cf58d08 100644
--- a/mozilla/java/webclient/build-tests.xml
+++ b/mozilla/java/webclient/build-tests.xml
@@ -1 +1 @@
-<!--
 Copyright 2002 Sun Microsystems, Inc. All rights reserved.
 SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-->

<project name="Webclient Unit Tests" default="run.test" basedir=".">

<!--
        This is a generic build.xml file for Ant that is used to run the
        Webclient unit tests. This build file *must* be called from the
        build.xml file in order to inherit most of it's needed properties
        (See below for the list of these properties).
-->

<!-- ========== Prerequisite Properties =================================== -->


<!--
        These properties MUST be set on the "ant" command line, the "antrc"
        properties file in your home directory, or from settings in a superior
        build.xml script.

        build.home                    Base directory into which we are building
                                      the Struts components.

        servlet.jar                   The servlet jar (either 2.2 or 2.3)

        cactus.jar                    The Cactus jar (either for Servlet API
                                      2.2 or 2.3)

        cactus.ant.jar                The Cactus custom Ant tasks jar

        httpclient.jar                The Cactus httpclient jar

        junit.jar                     The JUnit jar

        tomcat.home                   The home directory of where Tomcat 4.0
                                      is installed

        compile.debug                 The debug mode for compilation

        compile.deprecation           The deprecation mode for compilation

        compile.optimize              The optimization mode for compilation

        src.dir                       The location of the source directory

        app.name                      The name of the Struts jar (without the
                                      '.jar' suffix

-->

<!-- ========== Initialization Properties ================================= -->

<!-- ========== Derived Properties ======================================== -->

<!--
        These property values are derived from values defined above, and
        generally should NOT be overridden by command line settings
-->

    <!-- Default value for debugging arguments is no.  Override in
         build.properties -->
    <property name="debug.jvm.args" value=""/>

    <!-- Source directory for tests -->
    <property name="src.test.dir" value="${basedir}/test/automated/src/classes"/>

    <!-- Output directory for tests -->
    <property name="out.test.dir" value="${build.home}/test"/>

    <!-- Output directory for test data files -->
    <property name="build.test" value="${basedir}/build.test"/>

    <property name="native.waitForDebugger" value=""/>

    <path id="test.classpath">
      <pathelement location="${junit.jar}"/>
      <pathelement location="${build.home}"/>
      <pathelement location="${out.test.dir}/classes"/>
    </path>


<!-- ========== Executable Targets ======================================== -->

<!-- 
        Compile unit tests
-->
    <target name="compile.test">

        <echo message="${build.home}"/>

        <mkdir  dir="${out.test.dir}/classes"/>

        <javac srcdir="${src.test.dir}"
            destdir="${out.test.dir}/classes"
            debug="${compile.debug}"
            optimize="${compile.optimize}"
            deprecation="${compile.deprecation}">

              <classpath refid="test.classpath"/>
        </javac>

    </target>

    <target name="copy-test-data-files">
        <!-- Copy Unit test static files. -->

        <mkdir  dir="${build.test}"/>

        <copy todir="${build.test}">
            <fileset dir="${basedir}/test/automated/src/test"/>
        </copy>
   </target>


    <target name="clean">

      <delete dir="${out.test.dir}/classes"/>
      <delete dir="${build.test}"/>

    </target>

    <target name="run.test" depends="compile.test,copy-test-data-files">

        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
            <jvmarg value="-Djava.library.path=${myenv.MOZILLA_FIVE_HOME}${PATH_SEP}${myenv.MOZILLA_FIVE_HOME}/components"/>
            <jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
            <jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
            <jvmarg value="-DBROWSER_BIN_DIR=${myenv.MOZILLA_FIVE_HOME}"/>
            <sysproperty key="native.waitForDebugger" 
                         value="${native.waitForDebugger}"/>
            <jvmarg line="${debug.jvm.args}"/>

            <classpath refid="test.classpath"/>

            <formatter type="plain" usefile="false"/>
            <test name="org.mozilla.webclient.BrowserControlFactoryTest"/>
            <test name="org.mozilla.webclient.ProfileManagerTest"/>
            <test name="org.mozilla.webclient.BookmarksTest"/>
<!--
            <test name="org.mozilla.webclient.PreferencesTest"/>
            <test name="org.mozilla.webclient.NavigationTest"/>
-->
            <test name="org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImplTest"/>
            <test name="org.mozilla.webclient.impl.WebclientFactoryImplTest"/>
<!-- non-running tests 

            <test name="org.mozilla.webclient.wrapper_native.gtk.TestGtkBrowserControlCanvas"/>
-->

        </junit>

    </target>


</project>
\ No newline at end of file
+<!--
 Copyright 2002 Sun Microsystems, Inc. All rights reserved.
 SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-->

<project name="Webclient Unit Tests" default="run.test" basedir=".">

<!--
        This is a generic build.xml file for Ant that is used to run the
        Webclient unit tests. This build file *must* be called from the
        build.xml file in order to inherit most of it's needed properties
        (See below for the list of these properties).
-->

<!-- ========== Prerequisite Properties =================================== -->


<!--
        These properties MUST be set on the "ant" command line, the "antrc"
        properties file in your home directory, or from settings in a superior
        build.xml script.

        build.home                    Base directory into which we are building
                                      the Struts components.

        servlet.jar                   The servlet jar (either 2.2 or 2.3)

        cactus.jar                    The Cactus jar (either for Servlet API
                                      2.2 or 2.3)

        cactus.ant.jar                The Cactus custom Ant tasks jar

        httpclient.jar                The Cactus httpclient jar

        junit.jar                     The JUnit jar

        tomcat.home                   The home directory of where Tomcat 4.0
                                      is installed

        compile.debug                 The debug mode for compilation

        compile.deprecation           The deprecation mode for compilation

        compile.optimize              The optimization mode for compilation

        src.dir                       The location of the source directory

        app.name                      The name of the Struts jar (without the
                                      '.jar' suffix

-->

<!-- ========== Initialization Properties ================================= -->

<!-- ========== Derived Properties ======================================== -->

<!--
        These property values are derived from values defined above, and
        generally should NOT be overridden by command line settings
-->

    <!-- Default value for debugging arguments is no.  Override in
         build.properties -->
    <property name="debug.jvm.args" value=""/>

    <!-- Source directory for tests -->
    <property name="src.test.dir" value="${basedir}/test/automated/src/classes"/>

    <!-- Output directory for tests -->
    <property name="out.test.dir" value="${build.home}/test"/>

    <!-- Output directory for test data files -->
    <property name="build.test" value="${basedir}/build.test"/>

    <property name="native.waitForDebugger" value=""/>

    <path id="test.classpath">
      <pathelement location="${junit.jar}"/>
      <pathelement location="${build.home}"/>
      <pathelement location="${out.test.dir}/classes"/>
    </path>


<!-- ========== Executable Targets ======================================== -->

<!-- 
        Compile unit tests
-->
    <target name="compile.test">

        <echo message="${build.home}"/>

        <mkdir  dir="${out.test.dir}/classes"/>

        <javac srcdir="${src.test.dir}"
            destdir="${out.test.dir}/classes"
            debug="${compile.debug}"
            optimize="${compile.optimize}"
            deprecation="${compile.deprecation}">

              <classpath refid="test.classpath"/>
        </javac>

    </target>

    <target name="copy-test-data-files">
        <!-- Copy Unit test static files. -->

        <mkdir  dir="${build.test}"/>

        <copy todir="${build.test}">
            <fileset dir="${basedir}/test/automated/src/test"/>
        </copy>
   </target>


    <target name="clean">

      <delete dir="${out.test.dir}/classes"/>
      <delete dir="${build.test}"/>

    </target>

    <target name="run.test" depends="compile.test,copy-test-data-files">

        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
            <jvmarg value="-Djava.library.path=${myenv.MOZILLA_FIVE_HOME}${PATH_SEP}${myenv.MOZILLA_FIVE_HOME}/components"/>
            <jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
            <jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
            <jvmarg value="-DBROWSER_BIN_DIR=${myenv.MOZILLA_FIVE_HOME}"/>
            <sysproperty key="native.waitForDebugger" 
                         value="${native.waitForDebugger}"/>
            <jvmarg line="${debug.jvm.args}"/>

            <classpath refid="test.classpath"/>

            <formatter type="plain" usefile="false"/>
            <test name="org.mozilla.webclient.BrowserControlFactoryTest"/>
            <test name="org.mozilla.webclient.ProfileManagerTest"/>
            <test name="org.mozilla.webclient.BookmarksTest"/>
            <test name="org.mozilla.webclient.PreferencesTest"/>
            <test name="org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImplTest"/>
            <test name="org.mozilla.webclient.impl.WebclientFactoryImplTest"/>
            <test name="org.mozilla.webclient.NavigationTest"/>
<!-- non-running tests 

            <test name="org.mozilla.webclient.wrapper_native.gtk.TestGtkBrowserControlCanvas"/>
-->

        </junit>

    </target>


</project>
\ No newline at end of file
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
index 542ced66e40..85dde3e00fb 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
@@ -106,9 +106,6 @@ public void setPref(String prefName, String prefValue)
     if (null == prefName) {
         return;
     }
-    if (null == prefValue) {
-        return;
-    }
     // determine the type of pref value: String, boolean, integer
     try {
         Integer intVal = Integer.valueOf(prefValue);
@@ -116,7 +113,8 @@ public void setPref(String prefName, String prefValue)
     }
     catch (NumberFormatException e) {
         // it's not an integer
-        if (prefValue.equals("true") || prefValue.equals("false")) {
+        if (null != prefValue &&
+            (prefValue.equals("true") || prefValue.equals("false"))) {
             Boolean boolVal = Boolean.valueOf(prefValue);
             nativeSetBoolPref(getWrapperFactory().getNativeContext(), prefName, 
                               boolVal.booleanValue());
diff --git a/mozilla/java/webclient/src_moz/PreferencesImpl.cpp b/mozilla/java/webclient/src_moz/PreferencesImpl.cpp
index 679f9ea7784..e9e086dfb34 100644
--- a/mozilla/java/webclient/src_moz/PreferencesImpl.cpp
+++ b/mozilla/java/webclient/src_moz/PreferencesImpl.cpp
@@ -111,22 +111,28 @@ Java_org_mozilla_webclient_impl_wrapper_1native_PreferencesImpl_nativeSetUnichar
     
     const char	*	prefNameChars = (char *)::util_GetStringUTFChars(env, 
                                                                      prefName);
-    const jchar	*	prefValueChars = (jchar *)::util_GetStringChars(env, 
-                                                                    prefValue);
-    if (nsnull == prefNameChars) {
-        ::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref name");
-        rv = NS_ERROR_NULL_POINTER;
-        goto OMWIWNPINSUP_CLEANUP;
+    const jchar	*	prefValueChars = nsnull;
+    if (nsnull != prefValue) {
+        prefValueChars = 
+            (jchar *)::util_GetStringChars(env, prefValue);
+        if (nsnull == prefNameChars) {
+            ::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref name");
+            rv = NS_ERROR_NULL_POINTER;
+            goto OMWIWNPINSUP_CLEANUP;
+        }
+        if (nsnull == prefValueChars) {
+            ::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref value");
+            rv = NS_ERROR_NULL_POINTER;
+            goto OMWIWNPINSUP_CLEANUP;
+        }
+        
+        rv = prefs->SetUnicharPref(prefNameChars, 
+                                   (const PRUnichar *) prefValueChars);
     }
-    if (nsnull == prefValueChars) {
-        ::util_ThrowExceptionToJava(env, "nativeSetUnicharPref: unable to extract Java string for pref value");
-        rv = NS_ERROR_NULL_POINTER;
-        goto OMWIWNPINSUP_CLEANUP;
+    else {
+        rv = prefs->ClearUserPref(prefNameChars);
     }
 
-    rv = prefs->SetUnicharPref(prefNameChars, 
-                               (const PRUnichar *) prefValueChars);
-
  OMWIWNPINSUP_CLEANUP:
     
     ::util_ReleaseStringUTFChars(env, prefName, prefNameChars);