From 293e5569b511bc22e0278b8a5f0578b5ea0b3e38 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 26 Feb 2004 04:21:24 +0000
Subject: [PATCH] This checkin makes all the existing webclient unit tests run
 successfully.  We are now ready to continue with webclient 2.0 development.

M build-tests.xml

- formatting

M build.xml

- added target that skips the "main" dependency.

M src_moz/ProfileManagerImpl.cpp

- correct error messages

M test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java

- reset the system to the original profile before deleting the new one.


git-svn-id: svn://10.0.0.236/trunk@153268 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/java/webclient/build-tests.xml                 |  2 +-
 mozilla/java/webclient/build.xml                       | 10 +++++++++-
 mozilla/java/webclient/src_moz/ProfileManagerImpl.cpp  |  6 +++---
 .../org/mozilla/webclient/ProfileManagerTest.java      |  6 +++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/mozilla/java/webclient/build-tests.xml b/mozilla/java/webclient/build-tests.xml
index c3b6f4ea208..73819e38b55 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.PreferencesTest"/>
            <test name="org.mozilla.webclient.BookmarksTest"/>
            <test name="org.mozilla.webclient.impl.WebclientFactoryImplTest"/>
            <test name="org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImplTest"/>

<!-- 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.PreferencesTest"/>
            <test name="org.mozilla.webclient.BookmarksTest"/>
            <test name="org.mozilla.webclient.impl.WebclientFactoryImplTest"/>
            <test name="org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImplTest"/>

<!-- 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/build.xml b/mozilla/java/webclient/build.xml
index 62d53cbfdff..bc447336896 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -293,10 +293,18 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
 
   </target>
 
-  <target name="test" depends="main" description="Run unit tests">
+  <target name="test" depends="main" 
+          description="compile everything and Run unit tests">
+
+    <antcall target="run.test" />
+    
+  </target>
+
+  <target name="run.test" description="Run unit tests">
 
     <ant antfile="build-tests.xml" target="run.test"/>
     
   </target>
 
+
 </project>
diff --git a/mozilla/java/webclient/src_moz/ProfileManagerImpl.cpp b/mozilla/java/webclient/src_moz/ProfileManagerImpl.cpp
index 43105cd2d5d..1cebd33385f 100644
--- a/mozilla/java/webclient/src_moz/ProfileManagerImpl.cpp
+++ b/mozilla/java/webclient/src_moz/ProfileManagerImpl.cpp
@@ -370,10 +370,10 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_ProfileMa
         (PRUnichar *) ::util_GetStringChars(env, oldNameJstr),
         *newName = (nsnull == newNameJstr) ? nsnull :
         (PRUnichar *) ::util_GetStringChars(env, newNameJstr);
-    
+
     rv = profile->RenameProfile(oldName, newName);
     if (NS_FAILED(rv)) {
-        ::util_ThrowExceptionToJava(env, "Can't create new profile.");
+        ::util_ThrowExceptionToJava(env, "Can't rename new profile.");
     }
     
     ::util_ReleaseStringChars(env, oldNameJstr, oldName);
@@ -402,7 +402,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_ProfileMa
     
     rv = profile->DeleteProfile(profileName, canDeleteFiles);
     if (NS_FAILED(rv)) {
-        ::util_ThrowExceptionToJava(env, "Can't create new profile.");
+        ::util_ThrowExceptionToJava(env, "Can't delete profile.");
     }
     
     ::util_ReleaseStringChars(env, profileNameJstr, profileName);
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java
index 98a92cb22be..3f03c843d48 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: ProfileManagerTest.java,v 1.1 2003-09-28 06:29:18 edburns%acm.org Exp $
+ * $Id: ProfileManagerTest.java,v 1.2 2004-02-26 04:21:24 edburns%acm.org Exp $
  */
 
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -117,6 +117,10 @@ public class ProfileManagerTest extends WebclientTestCase {
 	}
 	assertTrue(!hasExpectedProfile);
 
+	// switch back to the base profile
+	profiles = profileManager.getProfileList();
+	profileManager.setCurrentProfile(profiles[0]);
+
 	// test that we can delete the new profile
 	profileManager.deleteProfile(newName, true);