Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is a checkpoint milestone for webclient 2.0. Webclient currently

Browse Source 
doesn't run, but several unit tests for webclient do.

I'll be proceeding through the rest of the webclient interfaces,
building junit tests as I go, in the coming months.  I hope to flesh out
the basic framework, then publish build instructions, and hopefully I
can get some contributions from the community.

M util/classes/org/mozilla/util/Utilities.java

new method: getImplFromServices:

+     *
+     * <p>This method tries to load the resource
+     * <code>META-INF/services/&gt;interfaceClassName&gt;</code>, where
+     * <code>&gt;interfaceClassName&lt;</code> is the argument to this
+     * method.  If the resource is found, interpret it as a
+     * <code>Properties</code> file and read out its first line.
+     * Interpret the first line as the fully qualified class name of a
+     * class that implements <code></code>.  The named class must have a
+     * public no-arg constructor.</p>

M webclient/build-tests.xml

- junit testcases for Webclient APIs, developed using test-first.

M webclient/build.xml

- changes for new package name structure:

  packages org.mozilla.webclient.{wrapper_native, wrapper_non_native} have gone away.  Replaced with org.mozilla.webclient.impl.{wrapper_native, wrapper_non_native}

- changes to accomodate "Services" based approach for pluggable
  webclient implementation.

- don't bother re-naming the javah generated files, just let javah pick
  the names.

- pass debugging args from build.properties

- changed name of junit test target to "test".

M webclient/classes_spec/org/mozilla/webclient/BrowserControl.java

- got rid of BROWSER_TYPE.  No longer necessary due to the new
  pluggability mechanism.

M webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java

- Leverage the org.mozilla.util.Utilities.getImplFromServices()
  mechanism to allow a vendor-pluggable webclient implementation of the
  new "WebclientFactory" interface, which is method for method
  compatible with BrowserControlFactory.  Make all BrowserControlFactory
  methods call through to methods on the vendor provided
  WebclientFactory implementation.

R webclient/classes_spec/org/mozilla/webclient/BrowserControlFactoryInterface.java
A webclient/classes_spec/org/mozilla/webclient/BrowserControlICE.java
R webclient/classes_spec/org/mozilla/webclient/BrowserControlImpl.java
R webclient/classes_spec/org/mozilla/webclient/BrowserType.java

- move all implementation specific classe to the impl package.

M webclient/classes_spec/org/mozilla/webclient/ImplObject.java

- ImplObject shouldn't depend on vendor private classes.

M webclient/classes_spec/org/mozilla/webclient/Preferences.java

- new method

+  public void unregisterPrefChangedCallback(PrefChangedCallback cb,
+                                            String prefName, Object closure);

M webclient/classes_spec/org/mozilla/webclient/ProfileManager.java

- properly specify this interface.

A webclient/classes_spec/org/mozilla/webclient/WebclientFactory.java

 * <p>This interface allows a pluggable webclient API implementation.
 * The static methods in {@link BrowserControlFactory} call through to
 * methods on this interface.  Please see {@link BrowserControlFactory}
 * for information on how to hook up your <code>WebclientFactory</code>
 * implementation to the <code>BrowserControlFactory</code></p>

R webclient/classes_spec/org/mozilla/webclient/WrapperFactory.java
R webclient/classes_spec/org/mozilla/webclient/impl/BrowserControlFactoryImpl.java

- moved these to the impl class

A webclient/classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/Service.java
A webclient/classes_spec/org/mozilla/webclient/impl/WebclientFactoryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/WrapperFactory.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarkEntryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ISupportsPeer.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ImplObjectNative.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ProfileManagerImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFTreeNode.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/SelectionImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WCEventListenerWrapper.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WCMouseListenerImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/gtk/GtkBrowserControlCanvas.java
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/win32/Win32BrowserControlCanvas.java

- copied from old package naming scheme.

- lots and lots of cleanup.

R webclient/classes_spec/org/mozilla/webclient/wrapper_native/BookmarkEntryImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/BookmarksImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/EventRegistrationImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/HistoryImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/ISupportsPeer.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/ImplObjectNative.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/NavigationImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/PreferencesImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/RDFEnumeration.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/RDFTreeNode.java
A webclient/classes_spec/org/mozilla/webclient/wrapper_native/README
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/SelectionImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WCEventListenerWrapper.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WCMouseListenerImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WindowControlImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/gtk/GtkBrowserControlCanvas.java
R webclient/classes_spec/org/mozilla/webclient/wrapper_native/win32/Win32BrowserControlCanvas.java

- removed from old package naming scheme

M webclient/src_moz/BookmarksImpl.cpp

- remove dependency on RDFActionEvents by inlining all the code that
  formerly was in the events.

- package name change

- JNI include file name change

M webclient/src_moz/CurrentPageImpl.cpp
M webclient/src_moz/HistoryImpl.cpp
M webclient/src_moz/ISupportsPeer.cpp

- package name change

- JNI include file name change

M webclient/src_moz/Makefile.in

- get rid of PreferencesActionEvents.cpp and RDFActionEvents.cpp

- add ProfileManagerImpl.cpp

M webclient/src_moz/NativeEventThread.cpp

- this file is not done yet.  I've been pulling misplaced initialization
  stuff out of here and putting it into WrapperFactoryImpl.cpp.

- got rid of gComponentManager, since we can use do_CreateInstance
  instead.

- package name change

- JNI include file name change

M webclient/src_moz/NativeEventThreadActionEvents.h

- JNI include file name change

M webclient/src_moz/NavigationImpl.cpp

- package name change

- JNI include file name change

R webclient/src_moz/PreferencesActionEvents.cpp
R webclient/src_moz/PreferencesActionEvents.h

- don't need these anymore!  woohoo!

M webclient/src_moz/PreferencesImpl.cpp

- remove dependency on PreferencesActionEvents by inlining code into the
  methods that used to use the events.

A webclient/src_moz/ProfileManagerImpl.cpp

- new class, implementation of the ProfileManager interface.

M webclient/src_moz/PromptActionEvents.cpp

- change erroneous comment so my grep performed correctly.

R webclient/src_moz/RDFActionEvents.cpp
R webclient/src_moz/RDFActionEvents.h

- don't need these anymore!  woohoo!

M webclient/src_moz/RDFEnumeration.cpp
M webclient/src_moz/RDFTreeNode.cpp

- remove dependency on RDFActionEvents by inlining code into the
  methods that used to use the events.

M webclient/src_moz/WindowControlActionEvents.cpp

- deallocate shareInitiContext.

M webclient/src_moz/WindowControlImpl.cpp

- package name change

- JNI include file name change

- remove the "sleep so I can attach gdb" code.  Moved to
  WrapperFactoryImpl.cpp.

M webclient/src_moz/WrapperFactoryImpl.cpp

- lots of changes.  This is now where the app initialization and
  shutdown happens,

M webclient/src_moz/dom_util.cpp

- comment change

M webclient/src_moz/ns_globals.h

- get rid of inappropriate global usage.

M webclient/src_moz/ns_util.h

- new struct WebclientContext for singletons.

M webclient/src_moz/rdf_util.cpp

- new methods, rdf_startup and rdf_shutdown.

- replace calls to nsComponentManager::CreateInstance() with
  do_CreateInstance().

M webclient/src_moz/rdf_util.h

- new methods, rdf_startup and rdf_shutdown.

M webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp

- package name change

- JNI include file name change

M webclient/src_moz/gtk/GtkBrowserControlCanvasStub.cpp

- package name change

- JNI include file name change

- this file isn't needed anymore, thankfully!  I'll remove it soon.

M webclient/src_moz/gtk/StubFunctions.h

- package name change

- JNI include file name change

- this file isn't needed anymore, thankfully!  I'll remove it soon.

M webclient/src_moz/motif/BrowserControlNativeShimStub.cpp
M webclient/src_moz/motif/MotifBrowserControlCanvas.cpp
M webclient/src_moz/motif/MotifBrowserControlCanvasStub.cpp
M webclient/src_moz/motif/NativeLoaderStub.cpp
M webclient/src_moz/win32/Win32BrowserControlCanvas.cpp

- package name change

- JNI include file name change

M webclient/src_share/jni_util.cpp
M webclient/src_share/jni_util.h

- util_InitializeShareInitContext() takes a JNIEnv *.

- new methods

+void util_DeleteGlobalRef(JNIEnv *env, jobject toDeleteRef);
+void util_DeleteLocalRef(JNIEnv *env, jobject toDeleteRef);
+void util_getSystemProperty(JNIEnv *env,
+                            const char *propName,
+                            char *propValue,
+                            jint propValueLen);


M webclient/src_share/jni_util_export.cpp
M webclient/src_share/jni_util_export.h

+JNIEXPORT jobjectArray util_GetJstringArrayFromJcharArray(JNIEnv *env,
+                                                          jint len,
+                                                          jchar **strings,
+                                                          jint *stringLengths)

A webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java
R webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java
A webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/gtk/TestGtkBrowserControlCanvas.java
R webclient/test/automated/src/classes/org/mozilla/webclient/wrapper_native/gtk/TestGtkBrowserControlCanvas.java
A webclient/test/automated/src/test/BrowserControlFactoryTest_correct

- junit tests!  TEST FIRST!


git-svn-id: svn://10.0.0.236/trunk@147393 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2003-09-28 06:29:22 +00:00
parent 6218fccfa7
commit cfc2315e49
81 changed files with 3670 additions and 3462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BookmarksTest.java Normal file
View File

@@ -0,0 +1,107 @@
/*
* $Id: BookmarksTest.java,v 1.1 2003-09-28 06:29:18 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Sun
* Microsystems, Inc. Portions created by Sun are
* Copyright (C) 1999 Sun Microsystems, Inc. All
* Rights Reserved.
*
* Contributor(s): Ed Burns &lt;edburns@acm.org&gt;
*/
package org.mozilla.webclient;
import junit.framework.TestSuite;
import junit.framework.Test;
import java.util.Enumeration;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreeNode;
// BookmarksTest.java
public class BookmarksTest extends WebclientTestCase {
public BookmarksTest(String name) {
super(name);
}
public static Test suite() {
return (new TestSuite(BookmarksTest.class));
}
//
// Constants
//
//
// Testcases
//
public void testBookmarks() throws Exception {
BrowserControl firstBrowserControl = null;
BrowserControlFactory.setAppData(getBrowserBinDir());
firstBrowserControl = BrowserControlFactory.newBrowserControl();
assertNotNull(firstBrowserControl);
// test we can get the bookmarks
TreeModel tree = null;
TreePrinter printer = new TreePrinter();
Bookmarks bookmarks = (Bookmarks)
firstBrowserControl.queryInterface(BrowserControl.BOOKMARKS_NAME);
assertNotNull(bookmarks);
// test that we can get the bookmarks tree
tree = bookmarks.getBookmarks();
assertNotNull(bookmarks);
walkTree((TreeNode) tree.getRoot(), printer, null);
BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
BrowserControlFactory.appTerminate();
}
interface NodeCallback {
public void takeActionOnNode(TreeNode node, int depth, Object closure);
}
class TreePrinter extends Object implements NodeCallback {
public void takeActionOnNode(TreeNode node, int depth, Object closure){
for (int i = 0; i < depth; i++) {
System.out.print(" ");
}
System.out.println(node.toString());
}
}
protected int depth = 0;
protected void walkTree(TreeNode root, NodeCallback cb, Object closure) {
Enumeration children = root.children();
TreeNode child = null;
cb.takeActionOnNode(root, depth, closure);
while (children.hasMoreElements()) {
depth++;
walkTree((TreeNode) children.nextElement(), cb, closure);
depth--;
}
}
}

119
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java Normal file
View File

@@ -0,0 +1,119 @@
/*
* $Id: PreferencesTest.java,v 1.1 2003-09-28 06:29:18 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Sun
* Microsystems, Inc. Portions created by Sun are
* Copyright (C) 1999 Sun Microsystems, Inc. All
* Rights Reserved.
*
* Contributor(s): Ed Burns &lt;edburns@acm.org&gt;
*/
package org.mozilla.webclient;
import junit.framework.TestSuite;
import junit.framework.Test;
import java.util.Properties;
import java.util.Iterator;
// PreferencesTest.java
public class PreferencesTest extends WebclientTestCase {
public PreferencesTest(String name) {
super(name);
}
public static Test suite() {
return (new TestSuite(PreferencesTest.class));
}
//
// Constants
//
public static final String CLOSURE = "closure";
public static final String PREFNAME = "webclient.pref";
public static final String PREFVALUE = "webclient.value";
//
// Testcases
//
public void testPreferences() throws Exception {
Properties prefProperties = null;
BrowserControl firstBrowserControl = null;
PrefChangedCallback callback = new TestPrefChangedCallback();
BrowserControlFactory.setAppData(getBrowserBinDir());
firstBrowserControl = BrowserControlFactory.newBrowserControl();
assertNotNull(firstBrowserControl);
// test we can get the prefs
Preferences prefs = (Preferences)
firstBrowserControl.queryInterface(BrowserControl.PREFERENCES_NAME);
assertNotNull(prefs);
// make sure we don't have the pref already
prefProperties = prefs.getPrefs();
assertNotNull(prefProperties);
assertTrue(null == prefProperties.getProperty(PREFNAME));
// test that we can set a preference
prefs.setPref(PREFNAME, PREFVALUE);
// test that the set value is actually there
prefProperties = prefs.getPrefs();
assertNotNull(prefProperties);
// test that the set value is as expected
assertTrue(prefProperties.getProperty(PREFNAME).equals(PREFVALUE));
// test that we can register a prefChangedCallback
System.setProperty(PREFNAME, "");
prefs.registerPrefChangedCallback(callback, PREFNAME, CLOSURE);
// change the value of the preference
prefs.setPref(PREFNAME, "newValue");
// test that our pref-change callback has been called.
assertTrue(System.getProperty(PREFNAME).equals(CLOSURE));
// test that we can successfully unregister our callback
prefs.unregisterPrefChangedCallback(callback, PREFNAME, CLOSURE);
// verify that it is no longer called
System.setProperty(PREFNAME, "");
prefs.setPref(PREFNAME, "newValue");
// test that our pref-change callback has not been called.
assertFalse(System.getProperty(PREFNAME).equals(CLOSURE));
BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
BrowserControlFactory.appTerminate();
}
class TestPrefChangedCallback extends Object implements PrefChangedCallback {
public int prefChanged(String prefName, Object closure) {
System.setProperty(prefName, closure.toString());
return 0;
}
}
}

141
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/ProfileManagerTest.java Normal file
View File

@@ -0,0 +1,141 @@
/*
* $Id: ProfileManagerTest.java,v 1.1 2003-09-28 06:29:18 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Sun
* Microsystems, Inc. Portions created by Sun are
* Copyright (C) 1999 Sun Microsystems, Inc. All
* Rights Reserved.
*
* Contributor(s): Ed Burns &lt;edburns@acm.org&gt;
*/
package org.mozilla.webclient;
import junit.framework.TestSuite;
import junit.framework.Test;
// ProfileManagerTest.java
public class ProfileManagerTest extends WebclientTestCase {
public ProfileManagerTest(String name) {
super(name);
}
public static Test suite() {
return (new TestSuite(ProfileManagerTest.class));
}
//
// Testcases
//
public void testProfile() throws Exception {
int
i = 0,
len = 0;
final String
name = "testProfile",
newName = "testProfile2";
BrowserControl firstBrowserControl = null;
BrowserControlFactory.setAppData(getBrowserBinDir());
firstBrowserControl = BrowserControlFactory.newBrowserControl();
assertNotNull(firstBrowserControl);
// test we can get the profileManager
ProfileManager profileManager = (ProfileManager)
firstBrowserControl.queryInterface(BrowserControl.PROFILE_MANAGER_NAME);
assertNotNull(profileManager);
// create a new profile
profileManager.createNewProfile(name, null, null, false);
// test that we have at least one profile
int profileCount = profileManager.getProfileCount();
assertTrue(1 <= profileCount);
// test that the new profile exists
assertTrue(profileManager.profileExists(name));
// test that we can set the current profile to the new profile
profileManager.setCurrentProfile(name);
// test that the current profile is the new profile
String currentProfile = profileManager.getCurrentProfile();
assertTrue(currentProfile.equals(name));
// test that the list of profiles contains the new profile
String [] profiles = profileManager.getProfileList();
assertNotNull(profiles);
boolean hasExpectedProfile = false;
for (i = 0, len = profiles.length; i < len; i++) {
if (profiles[i].equals(name)) {
hasExpectedProfile = true;
}
}
assertTrue(hasExpectedProfile);
// test that you can rename the newly created profile
profileManager.renameProfile(name, newName);
// test that the new profile exists
assertTrue(profileManager.profileExists(newName));
profiles = profileManager.getProfileList();
assertNotNull(profiles);
hasExpectedProfile = false;
for (i = 0, len = profiles.length; i < len; i++) {
if (profiles[i].equals(newName)) {
hasExpectedProfile = true;
}
}
assertTrue(hasExpectedProfile);
// test that the old name doesn't exist
assertTrue(!profileManager.profileExists(name));
profiles = profileManager.getProfileList();
assertNotNull(profiles);
hasExpectedProfile = false;
for (i = 0, len = profiles.length; i < len; i++) {
if (profiles[i].equals(name)) {
hasExpectedProfile = true;
}
}
assertTrue(!hasExpectedProfile);
// test that we can delete the new profile
profileManager.deleteProfile(newName, true);
// test that the new name doesn't exist
assertTrue(!profileManager.profileExists(newName));
profiles = profileManager.getProfileList();
assertNotNull(profiles);
hasExpectedProfile = false;
for (i = 0, len = profiles.length; i < len; i++) {
if (profiles[i].equals(newName)) {
hasExpectedProfile = true;
}
}
assertTrue(!hasExpectedProfile);
BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
BrowserControlFactory.appTerminate();
}
}

26
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java → mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/WebclientFactoryImplTest.java
View File

@@ -1,5 +1,5 @@
/*
* $Id: BrowserControlFactoryTest.java,v 1.1 2003-09-06 06:26:50 edburns%acm.org Exp $
* $Id: WebclientFactoryImplTest.java,v 1.1 2003-09-28 06:29:19 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -24,33 +24,33 @@
* Contributor(s): Ed Burns &lt;edburns@acm.org&gt;
*/
package org.mozilla.webclient;
package org.mozilla.webclient.impl;
import junit.framework.TestSuite;
import junit.framework.Test;
// BrowserControlFactoryTest.java
import org.mozilla.webclient.WebclientTestCase;
public class BrowserControlFactoryTest extends WebclientTestCase {
// WebclientFactoryImplTest.java
public BrowserControlFactoryTest(String name) {
public class WebclientFactoryImplTest extends WebclientTestCase {
public WebclientFactoryImplTest(String name) {
super(name);
}
public static Test suite() {
return (new TestSuite(BrowserControlFactoryTest.class));
return (new TestSuite(WebclientFactoryImplTest.class));
}
//
// Testcases
//
public void testFactoryLocator() {
try {
BrowserControlFactory.setAppData(getBrowserBinDir());
}
catch (Throwable e) {
assertTrue(e.getMessage() + " " + e, false);
}
public void testWrapperFactoryLocator() throws Exception {
WebclientFactoryImpl impl = new WebclientFactoryImpl();
WrapperFactory wrapper = impl.getWrapperFactory();
assertNotNull(wrapper);
}
}

68
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* $Id: WrapperFactoryImplTest.java,v 1.1 2003-09-28 06:29:20 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Sun
* Microsystems, Inc. Portions created by Sun are
* Copyright (C) 1999 Sun Microsystems, Inc. All
* Rights Reserved.
*
* Contributor(s): Ed Burns &lt;edburns@acm.org&gt;
*/
package org.mozilla.webclient.impl.wrapper_native;
import junit.framework.TestSuite;
import junit.framework.Test;
import org.mozilla.webclient.BrowserControl;
import org.mozilla.webclient.WebclientTestCase;
// WrapperFactoryImplTest.java
public class WrapperFactoryImplTest extends WebclientTestCase {
public WrapperFactoryImplTest(String name) {
super(name);
}
public static Test suite() {
return (new TestSuite(WrapperFactoryImplTest.class));
}
//
// Testcases
//
protected String [] expectedInterfaces = {
BrowserControl.WINDOW_CONTROL_NAME,
BrowserControl.NAVIGATION_NAME,
BrowserControl.HISTORY_NAME,
BrowserControl.EVENT_REGISTRATION_NAME,
BrowserControl.BOOKMARKS_NAME
};
public void testNativeDoesImplement() throws Exception {
WrapperFactoryImpl wrapper = new WrapperFactoryImpl();
wrapper.initialize(getBrowserBinDir());
for (int i = 0, len = expectedInterfaces.length; i < len; i++) {
assertTrue(wrapper.nativeDoesImplement(expectedInterfaces[i]));
}
}
}

6
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/wrapper_native/gtk/TestGtkBrowserControlCanvas.java → mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/gtk/TestGtkBrowserControlCanvas.java
View File

@@ -1,5 +1,5 @@
/*
* $Id: TestGtkBrowserControlCanvas.java,v 1.1 2002-10-01 00:39:30 edburns%acm.org Exp $
* $Id: TestGtkBrowserControlCanvas.java,v 1.1 2003-09-28 06:29:21 edburns%acm.org Exp $
*/
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -24,7 +24,7 @@
* Contributor(s):
*/
package org.mozilla.webclient.wrapper_native.gtk;
package org.mozilla.webclient.impl.wrapper_native.gtk;
// TestGtkBrowserControlCanvas.java
@@ -39,7 +39,7 @@ import org.mozilla.webclient.WebclientTestCase;
*
* <B>Lifetime And Scope</B> <P>
*
* @version $Id: TestGtkBrowserControlCanvas.java,v 1.1 2002-10-01 00:39:30 edburns%acm.org Exp $
* @version $Id: TestGtkBrowserControlCanvas.java,v 1.1 2003-09-28 06:29:21 edburns%acm.org Exp $
*
* @see Blah
* @see Bloo

28
mozilla/java/webclient/test/automated/src/test/BrowserControlFactoryTest_correct Normal file
View File

@@ -0,0 +1,28 @@
1024[80fc498]: WrapperFactoryImpl_nativeAppInitialize: entering
1024[80fc498]: WrapperFactoryImpl_nativeAppInitialize: nativeBinDir: /home/edburns/Projects/mozilla/MOZILLA_1_4/mozilla/dist/bin
1024[80fc498]: WrapperFactoryImpl_nativeAppInitialize: NS_NewNativeLocalFile rv: 0
1024[80fc498]: WrapperFactoryImpl_nativeAppInitialize: NS_InitEmbedding rv: 0
1024[80fc498]: WrapperFactoryImpl_nativeAppInitialize: exiting
1024[80fc498]: ProfileManagerImpl_nativeStartup: entering
1024[80fc498]: ProfileManagerImpl_nativeStartup: GetProfileCount rv: 0
1024[80fc498]: ProfileManagerImpl_nativeStartup: GetProfileList rv: 0
1024[80fc498]: ProfileManagerImpl_nativeStartup: commandLineService initialize rv: 0
1024[80fc498]: ProfileManagerImpl_nativeStartup: profileInternal startupWithArgs rv: 0
1024[80fc498]: ProfileManagerImpl_nativeStartup: exiting
1024[80fc498]: PreferencesImpl_nativeStartup: entering
1024[80fc498]: PreferencesImpl_nativeStartup: exiting
1024[80fc498]: BookmarksImpl_nativeStartup: entering
1024[80fc498]: WARNING: NS_ENSURE_TRUE(NS_SUCCEEDED(rv)) failed, file nsChromeRegistry.cpp, line 3188
1024[80fc498]: WARNING: NS_ENSURE_TRUE(NS_SUCCEEDED(rv)) failed, file nsChromeRegistry.cpp, line 3188
1024[80fc498]: BookmarksImpl_nativeStartup: exiting
1024[80fc498]: WrapperFactoryImpl_nativeAppSetup: entering
1024[80fc498]: WrapperFactoryImpl_nativeAppSetup: exiting
1024[80fc498]: BookmarksImpl_nativeShutdown: entering
1024[80fc498]: BookmarksImpl_nativeShutdown: exiting
1024[80fc498]: PreferencesImpl_nativeShutdown: entering
1024[80fc498]: PreferencesImpl_nativeShutdown: exiting
1024[80fc498]: ProfileManagerImpl_nativeShutdown: entering
1024[80fc498]: ProfileManagerImpl_nativeShutdown: exiting
1024[80fc498]: WrapperFactoryImpl_nativeTerminate: entering
1024[80fc498]: WrapperFactoryImpl_nativeTerminate: NS_TermEmbedding rv: 0
1024[80fc498]: WrapperFactoryImpl_nativeTerminate: exiting