diff --git a/build.xml b/build.xml index 1e6e16f..b7106e2 100644 --- a/build.xml +++ b/build.xml @@ -5,7 +5,7 @@ Created Feb 4, 2005 1:23:05 PM as part of migration from ANT Last Modified March 24, 2007 - Tested on Eclipse 3.2 with the Callisto plugis, Ant 1.6.1 and MS Visual C++ 8 (2005) + Tested on Eclipse 3.3 with the Europa C++ plugins, Ant 1.7 and MS Visual C++ 8 (2005) Eclipse users are pretty lucky because the whole project can be built inside eclipse due to their built in ANT support. @@ -55,6 +55,8 @@ + + @@ -206,12 +208,24 @@ - Building Jacob , sample and, test classes in ${release.dir.java} - Building Jacob classes in ${release.dir.java} + + Building sample classes in ${release.dir.java} + + Building Jacob test classes in ${release.dir.java} using junit jar ${junit.jar} + - + @@ -436,5 +450,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/docs/BuildingJacobFromSource.html b/docs/BuildingJacobFromSource.html index 2160cd3..f5004a5 100644 --- a/docs/BuildingJacobFromSource.html +++ b/docs/BuildingJacobFromSource.html @@ -17,28 +17,47 @@ Unpack the source archive zip file or check the files out of CVS into d:\jacob or some other familiar place. Source Java and JNI files are located in seperate packages from the unit tests and the samples.

-The java code is in .\src.
-The C++ code is in .\jni.
-Code is compiled into .\release
+

    +
  • docs: documentation +
  • jni: c++ code +
  • lib: libraries needed to compile unit tests +
  • release: a directory built by the ant script where jacob is constructed +
  • samples: sample programs +
  • src: Jacob Java source files +
  • unittest: JUnit 3.8.1 unit test programs. Run from the test target in build.xml +
  • vstudio: some out of date VC++ project files +
  • bulid.xml: the ant build script. It can be run from inside Eclipse +

The Servlet examples that required j2ee libraries to compile have temporarily been removed.

Development Environment

The simplest build environment includes MS Visual C++ 8.0 (Studio 2005), -Eclipse 3.2 with the C/C++ module and JDK 1.4. +Eclipse 3.3 with the C/C++ module and JDK 1.4. In that situation, you would just create the compilation_tools.properties -using the example build.xml as a template. All of the releases, up through 1.12, -were built using Visual C++ 6.0. 64 bit builds are supported starting with release 1.11. -Microsoft Visual C++ 8.0 supports 64 bit builds. so no additional tools are required. - +using the example build.xml as a template.
  • Microsoft Visual C++ 8.0 and it's included library. (to D:\apps in my case) -
  • Eclipse 3.2 or later from www.eclipse.org. I use the C/C++ plugin for - eclipse rather than MS Visual Studio +
  • Eclipse 3.3 or later from www.eclipse.org as the Java IDE. +
  • Eclipse 3.3 or later with the C/C++ plugin can be used for C coding in place of VC++ IDE.
  • Java JDK 1.4 (1.12 was built using 1.4.2.13) Compilation using JDK 1.5 has not been tested

+

+ + + + + + + + + + +
ReleaseC VersionJava VersionANT VersionEclipse Version Usedgenerated DLLs
up to 1.6VC 98 (6.0)?Used MAKE?32 bit
1.7VC 98 (6.0)1.41.??32 bit
1.8VC 98 (6.0)1.41.??32 bit
1.9VC 98 (6.0)1.41.??32 bit
1.10VC 98 (6.0)1.41.?3.??32 bit
1.11VC 98 (6.0) & 2003 64bit libs1.4.?1.6.?3.2.132 and 64 bit
1.12VC 98 (6.0) & 2003 64bit libs1.4.21.6.53.2.232 and 64 bit
1.13VC 20051.4.21.7.03.332 and 64 bit
+Microsoft Visual C++ 8.0 supports 64 bit builds. so no additional tools are required. +

Build Process

@@ -85,18 +104,20 @@ Open up the project properties and go to the "Java Build Path" properties panel.
  • Add folders samples, src and unittest to the build path in the Source tab.
  • Exclude *.txt from each of the newly added folders.
    • -
  • Set the build output directory to jacob-project/release/java
    • +
  • Set the default build output directory to jacob-project/release/java

    • Running Samples and Tests

    -Samples and test programs can be found in the source jar or in CVS. The programs +Samples and JUnit test programs can be found in the source jar or in CVS. The programs can be run from a bat file or from inside the Eclipse IDE. The java library path variable must be set to include the directory the jacob.dll is in. The simplest way to do that is to add it as a command line option. +

    +JUnit test programs can be individually run from inside eclipse or en-masse +via the ant test target. - -Last Modified 4/2007 +Last Modified 7/2007 1.13M3 \ No newline at end of file diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html index 4cf6664..71787a7 100644 --- a/docs/ReleaseNotes.html +++ b/docs/ReleaseNotes.html @@ -8,7 +8,10 @@ Now compiles with with Visual Studio 2005 (M1).

  • - Changed milestone release naming convetion from "pre..." to "M..." + Changed milestone release naming convention from "pre..." to "M..." +
    • +
  • + unittest directory now a JUnit 3.8.1 test repository
    • @@ -45,6 +48,11 @@ Feature Requests + + 1761727 + (M3) unittest directory test programs + converted to JUnit 3.8.1. New ANT target created to run all unit tests. +     diff --git a/lib/junit3.8.1/junit.jar b/lib/junit3.8.1/junit.jar new file mode 100644 index 0000000..674d71e Binary files /dev/null and b/lib/junit3.8.1/junit.jar differ diff --git a/unittest/com/jacob/test/MathProj/Math.cls b/samples/com/jacob/samples/MathProj/Math.cls similarity index 100% rename from unittest/com/jacob/test/MathProj/Math.cls rename to samples/com/jacob/samples/MathProj/Math.cls diff --git a/unittest/com/jacob/test/MathProj/MathTest.dll b/samples/com/jacob/samples/MathProj/MathTest.dll similarity index 100% rename from unittest/com/jacob/test/MathProj/MathTest.dll rename to samples/com/jacob/samples/MathProj/MathTest.dll diff --git a/unittest/com/jacob/test/MathProj/MathTest.exp b/samples/com/jacob/samples/MathProj/MathTest.exp similarity index 100% rename from unittest/com/jacob/test/MathProj/MathTest.exp rename to samples/com/jacob/samples/MathProj/MathTest.exp diff --git a/unittest/com/jacob/test/MathProj/MathTest.java b/samples/com/jacob/samples/MathProj/MathTest.java similarity index 97% rename from unittest/com/jacob/test/MathProj/MathTest.java rename to samples/com/jacob/samples/MathProj/MathTest.java index 4eae736..6f9ec77 100644 --- a/unittest/com/jacob/test/MathProj/MathTest.java +++ b/samples/com/jacob/samples/MathProj/MathTest.java @@ -1,4 +1,4 @@ -package com.jacob.test.MathProj; +package com.jacob.samples.MathProj; import com.jacob.activeX.ActiveXComponent; import com.jacob.com.*; diff --git a/unittest/com/jacob/test/MathProj/MathTest.lib b/samples/com/jacob/samples/MathProj/MathTest.lib similarity index 100% rename from unittest/com/jacob/test/MathProj/MathTest.lib rename to samples/com/jacob/samples/MathProj/MathTest.lib diff --git a/unittest/com/jacob/test/MathProj/MathTest.vbp b/samples/com/jacob/samples/MathProj/MathTest.vbp similarity index 100% rename from unittest/com/jacob/test/MathProj/MathTest.vbp rename to samples/com/jacob/samples/MathProj/MathTest.vbp diff --git a/unittest/com/jacob/test/MathProj/MathTest.vbw b/samples/com/jacob/samples/MathProj/MathTest.vbw similarity index 100% rename from unittest/com/jacob/test/MathProj/MathTest.vbw rename to samples/com/jacob/samples/MathProj/MathTest.vbw diff --git a/unittest/com/jacob/test/MathProj/README.txt b/samples/com/jacob/samples/MathProj/README.txt similarity index 100% rename from unittest/com/jacob/test/MathProj/README.txt rename to samples/com/jacob/samples/MathProj/README.txt diff --git a/unittest/com/jacob/test/atl/MultiFace/Face.cpp b/samples/com/jacob/samples/atl/MultiFace/Face.cpp similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/Face.cpp rename to samples/com/jacob/samples/atl/MultiFace/Face.cpp diff --git a/unittest/com/jacob/test/atl/MultiFace/Face.h b/samples/com/jacob/samples/atl/MultiFace/Face.h similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/Face.h rename to samples/com/jacob/samples/atl/MultiFace/Face.h diff --git a/unittest/com/jacob/test/atl/MultiFace/Face.rgs b/samples/com/jacob/samples/atl/MultiFace/Face.rgs similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/Face.rgs rename to samples/com/jacob/samples/atl/MultiFace/Face.rgs diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.aps b/samples/com/jacob/samples/atl/MultiFace/MultiFace.aps similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.aps rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.aps diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.cpp b/samples/com/jacob/samples/atl/MultiFace/MultiFace.cpp similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.cpp rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.cpp diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.def b/samples/com/jacob/samples/atl/MultiFace/MultiFace.def similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.def rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.def diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.dsp b/samples/com/jacob/samples/atl/MultiFace/MultiFace.dsp similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.dsp rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.dsp diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.dsw b/samples/com/jacob/samples/atl/MultiFace/MultiFace.dsw similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.dsw rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.dsw diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.h b/samples/com/jacob/samples/atl/MultiFace/MultiFace.h similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.h rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.h diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.idl b/samples/com/jacob/samples/atl/MultiFace/MultiFace.idl similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.idl rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.idl diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.ncb b/samples/com/jacob/samples/atl/MultiFace/MultiFace.ncb similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.ncb rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.ncb diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.opt b/samples/com/jacob/samples/atl/MultiFace/MultiFace.opt similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.opt rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.opt diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.plg b/samples/com/jacob/samples/atl/MultiFace/MultiFace.plg similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.plg rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.plg diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.rc b/samples/com/jacob/samples/atl/MultiFace/MultiFace.rc similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.rc rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.rc diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace.tlb b/samples/com/jacob/samples/atl/MultiFace/MultiFace.tlb similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace.tlb rename to samples/com/jacob/samples/atl/MultiFace/MultiFace.tlb diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace_i.c b/samples/com/jacob/samples/atl/MultiFace/MultiFace_i.c similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace_i.c rename to samples/com/jacob/samples/atl/MultiFace/MultiFace_i.c diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFace_p.c b/samples/com/jacob/samples/atl/MultiFace/MultiFace_p.c similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFace_p.c rename to samples/com/jacob/samples/atl/MultiFace/MultiFace_p.c diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFaceps.def b/samples/com/jacob/samples/atl/MultiFace/MultiFaceps.def similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFaceps.def rename to samples/com/jacob/samples/atl/MultiFace/MultiFaceps.def diff --git a/unittest/com/jacob/test/atl/MultiFace/MultiFaceps.mk b/samples/com/jacob/samples/atl/MultiFace/MultiFaceps.mk similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/MultiFaceps.mk rename to samples/com/jacob/samples/atl/MultiFace/MultiFaceps.mk diff --git a/unittest/com/jacob/test/atl/MultiFace/StdAfx.cpp b/samples/com/jacob/samples/atl/MultiFace/StdAfx.cpp similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/StdAfx.cpp rename to samples/com/jacob/samples/atl/MultiFace/StdAfx.cpp diff --git a/unittest/com/jacob/test/atl/MultiFace/StdAfx.h b/samples/com/jacob/samples/atl/MultiFace/StdAfx.h similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/StdAfx.h rename to samples/com/jacob/samples/atl/MultiFace/StdAfx.h diff --git a/unittest/com/jacob/test/atl/MultiFace/dlldata.c b/samples/com/jacob/samples/atl/MultiFace/dlldata.c similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/dlldata.c rename to samples/com/jacob/samples/atl/MultiFace/dlldata.c diff --git a/unittest/com/jacob/test/atl/MultiFace/resource.h b/samples/com/jacob/samples/atl/MultiFace/resource.h similarity index 100% rename from unittest/com/jacob/test/atl/MultiFace/resource.h rename to samples/com/jacob/samples/atl/MultiFace/resource.h diff --git a/unittest/com/jacob/test/atl/MultiFaceTest.java b/samples/com/jacob/samples/atl/MultiFaceTest.java similarity index 97% rename from unittest/com/jacob/test/atl/MultiFaceTest.java rename to samples/com/jacob/samples/atl/MultiFaceTest.java index 6908ff7..862860e 100644 --- a/unittest/com/jacob/test/atl/MultiFaceTest.java +++ b/samples/com/jacob/samples/atl/MultiFaceTest.java @@ -1,4 +1,4 @@ -package com.jacob.test.atl; +package com.jacob.samples.atl; import com.jacob.com.*; import com.jacob.activeX.*; diff --git a/unittest/com/jacob/test/atl/readme.txt b/samples/com/jacob/samples/atl/readme.txt similarity index 100% rename from unittest/com/jacob/test/atl/readme.txt rename to samples/com/jacob/samples/atl/readme.txt diff --git a/unittest/com/jacob/com/ActiveXComponentFactoryTest.java b/unittest/com/jacob/com/ActiveXComponentFactoryTest.java index 2a29715..7b3c340 100644 --- a/unittest/com/jacob/com/ActiveXComponentFactoryTest.java +++ b/unittest/com/jacob/com/ActiveXComponentFactoryTest.java @@ -1,6 +1,7 @@ package com.jacob.com; import com.jacob.activeX.ActiveXComponent; +import com.jacob.test.BaseTestCase; /** * This exercises the two Dispatch factor methods that let you @@ -9,8 +10,9 @@ import com.jacob.activeX.ActiveXComponent; * May need to run with some command line options (including from inside Eclipse). * Look in the docs area at the Jacob usage document for command line options. */ -public class ActiveXComponentFactoryTest { - public static void main(String args[]) throws Exception { +public class ActiveXComponentFactoryTest extends BaseTestCase { + + public void testActiveXComponentFactory(){ ComThread.InitSTA(true); try { System.out.println("This test only works if MS Word is NOT already running"); @@ -31,26 +33,27 @@ public class ActiveXComponentFactoryTest { } ActiveXComponent mTryConnectingThird = ActiveXComponent.connectToActiveInstance(mApplicationId); if (mTryConnectingThird == null ){ - System.out.println("was unable able to connect to MSWord after previous startup"); + fail("Was unable able to connect to MSWord after previous startup"); } else { - System.out.println("Correctly could connect to running MSWord"); + System.out.println("Stopping MSWord"); // stop it so we can fail trying to connect to a running mTryConnectingThird.invoke("Quit",new Variant[] {}); - System.out.println(" Word stopped"); } Thread.sleep(2000); ActiveXComponent mTryConnectingFourth = ActiveXComponent.connectToActiveInstance(mApplicationId); if (mTryConnectingFourth != null ){ - System.out.println("Was able to connect to MSWord that was stopped"); mTryConnectingFourth.invoke("Quit",new Variant[] {}); + fail("Was able to connect to MSWord that was stopped"); } else { System.out.println("Correctly could not connect to running MSWord"); } + } catch (InterruptedException ie){ } catch (ComException e) { e.printStackTrace(); + fail("Caught COM exception"); } finally { - System.out.println("About to sleep for 2 seconds so we can bask in the glory of this success"); - Thread.sleep(2000); + //System.out.println("About to sleep for 2 seconds so we can bask in the glory of this success"); + //Thread.sleep(2000); ComThread.Release(); ComThread.quitMainSTA(); } diff --git a/unittest/com/jacob/com/DateUtilitiesTest.java b/unittest/com/jacob/com/DateUtilitiesTest.java index 0b39566..ee9792d 100644 --- a/unittest/com/jacob/com/DateUtilitiesTest.java +++ b/unittest/com/jacob/com/DateUtilitiesTest.java @@ -4,35 +4,36 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import com.jacob.com.DateUtilities; +import junit.framework.TestCase; /** * test cases that should exercise the new date conversion code *

    - * May need to run with some command line options (including from inside Eclipse). - * Look in the docs area at the Jacob usage document for command line options. + * This test does not require any command line options because it is only a utility test */ -public class DateUtilitiesTest { +public class DateUtilitiesTest extends TestCase { - public static void main(String[] args) - { + public void testDateUtilities(){ Date now = new Date(); double comTimeForNow = DateUtilities.convertDateToWindowsTime(now); Date retrievedNow = DateUtilities.convertWindowsTimeToDate(comTimeForNow); if (!now.equals(retrievedNow)){ - System.out.println("DateUtilities Date Test failed " +now+ " != " +retrievedNow ); + fail("DateUtilities Date Test failed " +now+ " != " +retrievedNow ); } else { System.out.println("DateUtilities Date Test passed"); } + } + + public void testBeginningOfWindowsTime(){ // this is a magic time in the windows world Date beginningOfWindowsTime = new GregorianCalendar(1899, Calendar.DECEMBER, 30).getTime(); double comTimeForBeginningOfWindowsTime = DateUtilities.convertDateToWindowsTime(beginningOfWindowsTime); if (comTimeForBeginningOfWindowsTime > 0){ - System.out.println("Beginning of windows time test failed " + fail("Beginning of windows time test failed " +comTimeForBeginningOfWindowsTime); } else { System.out.println("Beginning of windows time test passed"); diff --git a/unittest/com/jacob/com/DispatchNullProgramId.java b/unittest/com/jacob/com/DispatchNullProgramId.java index 3861b28..2df6805 100644 --- a/unittest/com/jacob/com/DispatchNullProgramId.java +++ b/unittest/com/jacob/com/DispatchNullProgramId.java @@ -1,20 +1,22 @@ package com.jacob.com; +import com.jacob.test.BaseTestCase; + /** * This test verifies that the Dispatch object protects itself when * the constructor is called with a null program id. * Prior to this protection, the VM might crash.m - * @author joe - * + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. */ -public class DispatchNullProgramId { +public class DispatchNullProgramId extends BaseTestCase { - public static void main(String[] args) { + public void testNullProgramId(){ try { String nullParam = null; new Dispatch(nullParam); - System.out.println( - "the dispatch failed to protect itself from null program ids"); + fail("the dispatch failed to protect itself from null program ids"); } catch (IllegalArgumentException iae){ System.out.println( "the dispatch protected itself from null program ids"); @@ -22,8 +24,7 @@ public class DispatchNullProgramId { try { String nullParam = ""; new Dispatch(nullParam); - System.out.println( - "the dispatch failed to protect itself from empty string program ids"); + fail("the dispatch failed to protect itself from empty string program ids"); } catch (IllegalArgumentException iae){ System.out.println( "the dispatch protected itself from empty string program ids"); diff --git a/unittest/com/jacob/com/DispatchTest.java b/unittest/com/jacob/com/DispatchTest.java index 76540f5..3b2f4b5 100644 --- a/unittest/com/jacob/com/DispatchTest.java +++ b/unittest/com/jacob/com/DispatchTest.java @@ -2,30 +2,23 @@ package com.jacob.com; import java.util.Date; -/** - * Test some of the Dispatch utility methods - * May need to run with some command line options (including from inside Eclipse). - * If so, then try these - * 

    - *      -Djava.library.path=d:/jacob/release/x86 
- *      -Dcom.jacob.autogc=false 
- *      -Dcom.jacob.debug=false 
- *      -Xcheck:jni
- *
    - */ -public class DispatchTest { +import com.jacob.test.BaseTestCase; - public static void main(String[] args) - { +/** + * Test some of the Dispatch utility methods + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. + */ +public class DispatchTest extends BaseTestCase { + + public void testDispatch() { Date testDate = new Date(); Variant fromDate = Dispatch.obj2variant(testDate); Date returnedDate = fromDate.getJavaDate(); - System.out.println("test date is "+testDate); - System.out.println("VariantDate is "+fromDate.getJavaDate()); - if (testDate.equals(returnedDate)){ - - } else { - System.out.println("Could not call obj2variant(Date) and get it to work"); - } + //System.out.println("test date is "+testDate); + //System.out.println("VariantDate is "+fromDate.getJavaDate()); + assertTrue("Could not call obj2variant(Date) and get it to work", + testDate.equals(returnedDate)); } } diff --git a/unittest/com/jacob/com/DispatchValidDispatchTest.java b/unittest/com/jacob/com/DispatchValidDispatchTest.java index b1962a2..6f37ec4 100644 --- a/unittest/com/jacob/com/DispatchValidDispatchTest.java +++ b/unittest/com/jacob/com/DispatchValidDispatchTest.java @@ -1,29 +1,28 @@ package com.jacob.com; -/** - * Test armoring of dispatch static methods - * May need to run with some command line options (including from inside Eclipse). - * If so, then try these - * 

    - *      -Djava.library.path=d:/jacob/release/x86 
- *      -Dcom.jacob.autogc=false 
- *      -Dcom.jacob.debug=false 
- *      -Xcheck:jni
- *
    - */ -public class DispatchValidDispatchTest { +import com.jacob.test.BaseTestCase; - public static void main(String[] args) - { +/** + * Test armoring of dispatch static methods + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. + */ +public class DispatchValidDispatchTest extends BaseTestCase { + + public void testThrowIllegalArgumentException() { try { Dispatch.call(null, 0); - System.out.println("Failed to throw IllegalArgumentException"); + fail("Failed to throw IllegalArgumentException"); } catch (IllegalArgumentException iae){ System.out.println("Caught correct IllegalArgumentException: "+iae); } + } + public void testThrowIllegalStateException() { try { Dispatch foo = new Dispatch(); Dispatch.call(foo, 0); + fail("Failed to throw IllegalStateException"); } catch (IllegalStateException ise){ System.out.println("Caught correct IllegalStateException "+ise); } diff --git a/unittest/com/jacob/com/JacobObjectTest.java b/unittest/com/jacob/com/JacobObjectTest.java index 443fa7a..60ead35 100644 --- a/unittest/com/jacob/com/JacobObjectTest.java +++ b/unittest/com/jacob/com/JacobObjectTest.java @@ -1,24 +1,15 @@ package com.jacob.com; +import com.jacob.test.BaseTestCase; + /** * This will eventually be changed to a unit test. *

    * May need to run with some command line options (including from inside Eclipse). - * If so, then try these - * 

    - *      -Djava.library.path=d:/jacob/release/x86 
- *      -Dcom.jacob.autogc=false 
- *      -Dcom.jacob.debug=false 
- *      -Xcheck:jni
- *
    + * Look in the docs area at the Jacob usage document for command line options. */ -public class JacobObjectTest { +public class JacobObjectTest extends BaseTestCase { - public static void main(String args[]) throws Exception - { - JacobObjectTest testJig = new JacobObjectTest(); - testJig.testBuildVersion(); - } public void testBuildVersion(){ System.out.println("build version is "+JacobObject.getBuildVersion()); diff --git a/unittest/com/jacob/com/ROT2Test.java b/unittest/com/jacob/com/ROT2Test.java index 47f4e78..fb0d6ab 100644 --- a/unittest/com/jacob/com/ROT2Test.java +++ b/unittest/com/jacob/com/ROT2Test.java @@ -1,121 +1,117 @@ package com.jacob.com; +import com.jacob.test.BaseTestCase; + /** * This test class exists to test the WeakRefernce implementation . * * It is not useful if there isn't one at this time * - * This will eventually be changed to a unit test. - * *

    - * May need to run with some command line options (including from inside Eclipse). - * Look in the docs area at the Jacob usage document for command line options. + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. */ -public class ROT2Test -{ +public class ROT2Test extends BaseTestCase { - public static void main(String args[]) throws Exception - { - ROT2TestThread threads[] = new ROT2TestThread[4]; - for (int i = 0; i < threads.length; i++) - { - threads[i] = new ROT2TestThread("thread-" + i, 3000); - } - for (int i = 0; i < threads.length; i++) - { - threads[i].start(); - } - } -} + public void testDoesNotBlowUp() { + ROT2TestThread threads[] = new ROT2TestThread[4]; + for (int i = 0; i < threads.length; i++) { + threads[i] = new ROT2TestThread("thread-" + i, 3000); + } + for (int i = 0; i < threads.length; i++) { + threads[i].start(); + } + } -/** - * This wil try and exercise the thread support in the ROT - **/ + /** + * This will try and exercise the thread support in the ROT + */ -class ROT2TestThread extends Thread -{ - private java.util.List ThreadObjects; + public class ROT2TestThread extends Thread { + private java.util.List ThreadObjects; - private int initialRunSize = 0; - /** - * @param arg0 - */ - public ROT2TestThread(String arg0, int iStartCount) - { - super(arg0); - initialRunSize = iStartCount; - - } + private int initialRunSize = 0; - /** - * A semi-complexe serie of steps to put the ROT under stress. 1) discard - * half the objects we've created 2) if size is greater than 1 but not a - * even number, add 1 new object 3) stop when size is 1. - * - * @see java.lang.Runnable#run() - */ - public void run() - { - // something that keeps object references around - // so the gc can't collect them - // we need to create these in the thread so they end up in the right ROT table - ThreadObjects = new java.util.ArrayList(initialRunSize); - for (int i = 0; i < initialRunSize; i++) - { - // create the object - Variant aNewVariant = new Variant(getName() + "_" + i); - // create a hard reference to it - ThreadObjects.add(aNewVariant); - } + /** + * @param arg0 + */ + public ROT2TestThread(String arg0, int iStartCount) { + super(arg0); + initialRunSize = iStartCount; - while (ThreadObjects.size() > 1) - { - String message = ""; - message = getName()+" Workingset=" +ThreadObjects.size() - +" ROT: "; - message += "(before additions and gc "+ROT.getThreadObjects(false).size()+")"; - // if there is an odd number of objects greater than 2 - if (ThreadObjects.size() > 2 && ThreadObjects.size() % 2 != 0) - { - // add a new object - Variant aNewVariant = new Variant(getName() + "_*" + ThreadObjects.size()); - ThreadObjects.add(aNewVariant); - } - // now iterate across all the objects in our list - for (int i = ThreadObjects.size(); i > 0; i--) - { - // removing every other one? - if (i % 2 == 0) - { - // remove the reference so gc can get it - ThreadObjects.remove(i-1); - } + } - } - - try { - // simulate the system under load and run the GC - // should end up with weak references with no objects attached - Thread.sleep(9); - } catch (InterruptedException e){ - // the VM doesn't want us to sleep anymore, - // so get back to work - } - message += " (before gc, after additions "+ROT.getThreadObjects(false).size()+")"; - System.gc(); - message += " (after System.gc "+ROT.getThreadObjects(false).size()+")"; - System.out.println(message); - } - } + /** + * A semi-complexe serie of steps to put the ROT under stress. 1) + * discard half the objects we've created 2) if size is greater than 1 + * but not a even number, add 1 new object 3) stop when size is 1. + * + * @see java.lang.Runnable#run() + */ + public void run() { + // something that keeps object references around + // so the gc can't collect them + // we need to create these in the thread so they end up in the right + // ROT table + ThreadObjects = new java.util.ArrayList(initialRunSize); + for (int i = 0; i < initialRunSize; i++) { + // create the object + Variant aNewVariant = new Variant(getName() + "_" + i); - /** - * Another test would be to overide this to always return the same name. - * That would really screw the ROT! - * - * @see java.lang.Object#toString() - */ - public String toString() - { - return super.toString(); - } + // create a hard reference to it + ThreadObjects.add(aNewVariant); + } + + while (ThreadObjects.size() > 1) { + String message = ""; + message = getName() + " Workingset=" + ThreadObjects.size() + + " ROT: "; + message += "(before additions and gc " + + ROT.getThreadObjects(false).size() + ")"; + // if there is an odd number of objects greater than 2 + if (ThreadObjects.size() > 2 && ThreadObjects.size() % 2 != 0) { + // add a new object + Variant aNewVariant = new Variant(getName() + "_*" + + ThreadObjects.size()); + ThreadObjects.add(aNewVariant); + } + // now iterate across all the objects in our list + for (int i = ThreadObjects.size(); i > 0; i--) { + // removing every other one? + if (i % 2 == 0) { + // remove the reference so gc can get it + ThreadObjects.remove(i - 1); + } + + } + + try { + // simulate the system under load and run the GC + // should end up with weak references with no objects + // attached + Thread.sleep(9); + } catch (InterruptedException e) { + // the VM doesn't want us to sleep anymore, + // so get back to work + } + message += " (before gc, after additions " + + ROT.getThreadObjects(false).size() + ")"; + System.gc(); + message += " (after System.gc " + + ROT.getThreadObjects(false).size() + ")"; + System.out.println(message); + } + } + + /** + * Another test would be to override this to always return the same name. + * That would really screw the ROT! + * + * @see java.lang.Object#toString() + */ + public String toString() { + return super.toString(); + } + } } \ No newline at end of file diff --git a/unittest/com/jacob/com/ROT3Test.java b/unittest/com/jacob/com/ROT3Test.java index e12b818..3db3566 100644 --- a/unittest/com/jacob/com/ROT3Test.java +++ b/unittest/com/jacob/com/ROT3Test.java @@ -1,134 +1,134 @@ package com.jacob.com; +import com.jacob.test.BaseTestCase; + /** - * This trys to exercise ROT's garbage collecion - * This is named this way because the build.xml - * ignores files ending in Test when building the binary zip file + * This tries to exercise ROT's garbage collection This is named this way because + * the build.xml ignores files ending in Test when building the binary zip file * * This will eventually be changed to a unit test. * *

    - * May need to run with some command line options (including from inside Eclipse). - * Look in the docs area at the Jacob usage document for command line options. + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. */ -public class ROT3Test -{ +public class ROT3Test extends BaseTestCase { - public static void main(String args[]) throws Exception - { - ROT3TestThread threads[] = new ROT3TestThread[4]; - for (int i = 0; i < threads.length; i++) - { - threads[i] = new ROT3TestThread("thread-" + i, 3000+i*10); - } - for (int i = 0; i < threads.length; i++) - { - threads[i].start(); - } - } + public void testROTVersion3() { + ROT3TestThread threads[] = new ROT3TestThread[4]; + for (int i = 0; i < threads.length; i++) { + threads[i] = new ROT3TestThread("thread-" + i, 3000 + i * 10); + } + for (int i = 0; i < threads.length; i++) { + threads[i].start(); + } + } + + /** + * This will try and exercise the thread support in the ROT + */ + + public class ROT3TestThread extends Thread { + private java.util.List variansCreatedInThisThread; + + private int initialRunSize = 0; + + /** + * @param arg0 + */ + public ROT3TestThread(String arg0, int iStartCount) { + super(arg0); + initialRunSize = iStartCount; + + } + + /** + * A semi-complexe serie of steps to put the ROT under stress. 1) + * discard half the objects we've created 2) if size is greater than 1 + * but not a even number, add 1 new object 3) stop when size is 1. + * + * @see java.lang.Runnable#run() + */ + public void run() { + // something that keeps object references around + // so the gc can't collect them + // we need to create these in the thread so they end up in the right + // ROT table + variansCreatedInThisThread = new java.util.ArrayList(initialRunSize); + for (int i = 0; i < initialRunSize; i++) { + // create the object + Variant aNewVariant = new Variant(getName() + "_" + i); + // create a hard reference to it + variansCreatedInThisThread.add(aNewVariant); + } + + while (variansCreatedInThisThread.size() > 1) { + String message = ""; + message = getName() + " Workingset=" + + variansCreatedInThisThread.size() + + " ROT threadObject hashCode: " + + ROT.getThreadObjects(true).hashCode(); + message += " size before mods and gc " + + ROT.getThreadObjects(true).size() + ")"; + // If there are more than 10 objects in our cache then add 1/4 + // of that again + if (variansCreatedInThisThread.size() > 10) { + message += " (adding) "; + // add an additional 1/4 of our current number + for (int i = 0; i < variansCreatedInThisThread.size() / 4; i++) { + // add a new object + Variant aNewVariant = new Variant(getName() + "_*" + + variansCreatedInThisThread.size()); + variansCreatedInThisThread.add(aNewVariant); + } + } + // now iterate across 1/2 the objects in our list + message += " (removing) "; + for (int i = variansCreatedInThisThread.size(); i > 0; i--) { + // removing every other one? + if (i % 2 == 0) { + // remove the reference so gc can get it + if (!ROT.USE_AUTOMATIC_GARBAGE_COLLECTION) { + // uses deprecated API to set up a special situation + // because this is an ROT test + ROT + .removeObject((JacobObject) variansCreatedInThisThread + .get(i - 1)); + } + variansCreatedInThisThread.remove(i - 1); + } + + } + + message += " (after mods " + ROT.getThreadObjects(true).size() + + ")"; + // comm + if (!ROT.USE_AUTOMATIC_GARBAGE_COLLECTION) { + ROT.clearObjects(); + } + System.gc(); + try { + // vain attempt at letting the gc run + Thread.sleep(200); + } catch (InterruptedException ie) { + + } + message += " (after gc " + ROT.getThreadObjects(true).size() + + ")"; + message += " Should see GC if debug turned on..."; + System.out.println(message); + } + } + + /** + * Another test would be to overide this to always return the same name. + * That would really screw the ROT! + * + * @see java.lang.Object#toString() + */ + public String toString() { + return super.toString(); + } + } } - -/** - * This wil try and exercise the thread support in the ROT - **/ - -class ROT3TestThread extends Thread -{ - private java.util.List variansCreatedInThisThread; - - private int initialRunSize = 0; - /** - * @param arg0 - */ - public ROT3TestThread(String arg0, int iStartCount) - { - super(arg0); - initialRunSize = iStartCount; - - } - - /** - * A semi-complexe serie of steps to put the ROT under stress. 1) discard - * half the objects we've created 2) if size is greater than 1 but not a - * even number, add 1 new object 3) stop when size is 1. - * - * @see java.lang.Runnable#run() - */ - public void run() - { - // something that keeps object references around - // so the gc can't collect them - // we need to create these in the thread so they end up in the right ROT table - variansCreatedInThisThread = new java.util.ArrayList(initialRunSize); - for (int i = 0; i < initialRunSize; i++) - { - // create the object - Variant aNewVariant = new Variant(getName() + "_" + i); - // create a hard reference to it - variansCreatedInThisThread.add(aNewVariant); - } - - while (variansCreatedInThisThread.size() > 1) - { - String message = ""; - message = getName()+" Workingset=" +variansCreatedInThisThread.size() - +" ROT threadObject hashCode: "+ROT.getThreadObjects(true).hashCode(); - message += " size before mods and gc "+ROT.getThreadObjects(true).size()+")"; - // If there are more than 10 objects in our cache then add 1/4 of that again - if (variansCreatedInThisThread.size() > 10) - { - message+= " (adding) "; - // add an additional 1/4 of our current number - for ( int i = 0 ; i < variansCreatedInThisThread.size()/4 ; i++){ - // add a new object - Variant aNewVariant = new Variant(getName() + "_*" + variansCreatedInThisThread.size()); - variansCreatedInThisThread.add(aNewVariant); - } - } - // now iterate across 1/2 the objects in our list - message += " (removing) "; - for (int i = variansCreatedInThisThread.size(); i > 0; i--) - { - // removing every other one? - if (i % 2 == 0) - { - // remove the reference so gc can get it - if (!ROT.USE_AUTOMATIC_GARBAGE_COLLECTION){ - // uses deprecated API to set up a special situation - // because this is an ROT test - ROT.removeObject((JacobObject)variansCreatedInThisThread.get(i-1)); - } - variansCreatedInThisThread.remove(i-1); - } - - } - - message += " (after mods "+ROT.getThreadObjects(true).size()+")"; - // comm - if (!ROT.USE_AUTOMATIC_GARBAGE_COLLECTION){ - ROT.clearObjects(); - } - System.gc(); - try { - // vain attempt at letting the gc run - Thread.sleep(200); - } catch (InterruptedException ie){ - - } - message += " (after gc "+ROT.getThreadObjects(true).size()+")"; - message += " Should see GC if debug turned on..."; - System.out.println(message); - } - } - - /** - * Another test would be to overide this to always return the same name. - * That would really screw the ROT! - * - * @see java.lang.Object#toString() - */ - public String toString() - { - return super.toString(); - } -} \ No newline at end of file diff --git a/unittest/com/jacob/com/ROTTest.java b/unittest/com/jacob/com/ROTTest.java index 41694a2..dff211d 100644 --- a/unittest/com/jacob/com/ROTTest.java +++ b/unittest/com/jacob/com/ROTTest.java @@ -1,28 +1,16 @@ package com.jacob.com; -import com.jacob.com.ROT; +import com.jacob.test.BaseTestCase; /** - * This trys to exercise ROT's garbage collecion + * This tries to exercise ROT's garbage collection * * This will eventually be changed to a unit test. *

    * May need to run with some command line options (including from inside Eclipse). - * If so, then try these - * 

    - *      -Djava.library.path=d:/jacob/release/x86 
- *      -Dcom.jacob.autogc=false 
- *      -Dcom.jacob.debug=false 
- *      -Xcheck:jni
- *
    + * Look in the docs area at the Jacob usage document for command line options. */ -public class ROTTest { +public class ROTTest extends BaseTestCase { - public static void main(String args[]) throws Exception - { - ROTTest testJig = new ROTTest(); - testJig.testDontFillROTSystemProperty(); - testJig.testGCBehavior(); - } - + /** * verify the SystemProperty (classname).PutInROT functions as expected. * A value of false means instances of the class are not put in the ROT diff --git a/unittest/com/jacob/com/VariantDateTest.java b/unittest/com/jacob/com/VariantDateTest.java index 95e1c0a..371c51b 100644 --- a/unittest/com/jacob/com/VariantDateTest.java +++ b/unittest/com/jacob/com/VariantDateTest.java @@ -2,7 +2,7 @@ package com.jacob.com; import java.util.Date; -import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** * test cases that should exercise the new date conversion code @@ -10,32 +10,37 @@ import com.jacob.com.Variant; * May need to run with some command line options (including from inside Eclipse). * Look in the docs area at the Jacob usage document for command line options. */ -public class VariantDateTest { +public class VariantDateTest extends BaseTestCase { - public static void main(String[] args) - { + public void testVariantDate() { Date now = new Date(); Variant holder = new Variant(); holder.putDate(now); Date retrievedNow = holder.getJavaDate(); if (!now.equals(retrievedNow)){ - System.out.println("Variant Date Test failed " +now+ " != " +retrievedNow ); + fail("Variant Date Test failed " +now+ " != " +retrievedNow ); } else { - //System.out.println("Variant Date Test passed"); + System.out.println("Variant Date Test passed"); } + } + + public void testVariantDateToJavaObject(){ + Date now = new Date(); + Variant holder = new Variant(now); for ( int i = 0; i < 30000; i++){ Variant dateVariant = new Variant(now); + Date retrievedNow = holder.getJavaDate(); retrievedNow = dateVariant.getJavaDate(); if (!now.equals(retrievedNow)){ - System.out.println("Variant Date Test (1) failed " +now+ " != " +retrievedNow ); + fail("Variant Date Test (1) failed " +now+ " != " +retrievedNow ); } else { //System.out.println("Variant Date Test (1) passed"); } // verify auto typecasting works retrievedNow = (Date)dateVariant.toJavaObject(); if (!now.equals(retrievedNow)){ - System.out.println("Variant Date Test (2) failed " +now+ " != " +retrievedNow ); + fail("Variant Date Test (2) failed " +now+ " != " +retrievedNow ); } else { //System.out.println("Variant Date Test (2) passed "+retrievedNow); } @@ -47,7 +52,7 @@ public class VariantDateTest { System.out.println("int variant returned date"); } } - System.out.print("Test finished. All tests passed if no errors before this line"); + System.out.print("Test finished. All tests passed."); } diff --git a/unittest/com/jacob/com/VariantSerializationTest.java b/unittest/com/jacob/com/VariantSerializationTest.java deleted file mode 100644 index c664dfa..0000000 --- a/unittest/com/jacob/com/VariantSerializationTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.jacob.com; - -import java.io.*; - -/** - * Verifies serialization works for variants. - * Variant serialization is BROKEN and has been since 1.7 - *

    - * May need to run with some command line options (including from inside Eclipse). - * Look in the docs area at the Jacob usage document for command line options. - */ -class VariantSerializationTest { - - static Variant vs1 = new Variant("hi"); - static Variant vs2 = new Variant(123.456); - - public static void main(String[] args) throws Exception { - doJustSerialization(); - compareVariantBytes(); - } - - private static void compareVariantBytes() throws Exception{ - System.out.println("compareVariantBytes"); - Variant var1 = new Variant("hello"); - Variant var2 = new Variant("hello"); - byte[] var1Bytes = var1.SerializationWriteToBytes(); - byte[] var2Bytes = var2.SerializationWriteToBytes(); - for ( int i = 0 ; i < var1Bytes.length; i++){ - if (var1Bytes[i]!=var2Bytes[i]){ - System.out.println("variant strings differ at position "+i); - return; - } - } - System.out.println("two strings return identical serialization data"); - } - - private static void doJustSerialization() throws Exception { - System.out.println("doJustSerialization"); - // same thing with serialization - FileOutputStream fos; - FileInputStream fis; - fos = new FileOutputStream("foo.ser"); - ObjectOutputStream oos = new ObjectOutputStream(fos); - oos.writeObject(vs1); - //oos.writeObject(vs2); - oos.close(); - fos.close(); - - fis = new FileInputStream("foo.ser"); - ObjectInputStream ois = new ObjectInputStream(fis); - - Variant vss1 = null; - Variant vss2 = null; - - vss1 = (Variant) ois.readObject(); - //vss2 = (Variant) ois.readObject(); - ois.close(); - fis.close(); - - System.out.println(vss1); - System.out.println(vss2); - } -} diff --git a/unittest/com/jacob/com/VariantTest.java b/unittest/com/jacob/com/VariantTest.java index d85821e..6af029e 100644 --- a/unittest/com/jacob/com/VariantTest.java +++ b/unittest/com/jacob/com/VariantTest.java @@ -2,6 +2,8 @@ package com.jacob.com; import java.util.Date; +import com.jacob.test.BaseTestCase; + /** * runs through some of the get and set methods on Variant * @@ -9,33 +11,7 @@ import java.util.Date; * May need to run with some command line options (including from inside Eclipse). * Look in the docs area at the Jacob usage document for command line options. */ -class VariantTest { - public static void main(String[] args) { - System.out.println("Testing Started"); - VariantTest testJig = new VariantTest(); - testJig.testUninitializedVariant(); - testJig.testToStringDoesNotConvert(); - testJig.testPutsAndGets(); - testJig.testSafeReleaseBoolean(); - testJig.testSafeReleaseConstant(); - testJig.testSafeReleaseString(); - testJig.testObjectIsAConstant(); - testJig.testSomeChangeVT(); - testJig.testByRefToJavaObject(); - testJig.testDispatchToJavaObject(); - System.out.println("Starting last test"); - testJig.testManyThreadedInit(); - System.out.println("Testing Complete"); - - } - - /** - * dummy constructor - * - */ - public VariantTest(){ - - } +public class VariantTest extends BaseTestCase { /** * This verifies that toJavaObject() works for all of the @@ -45,21 +21,21 @@ class VariantTest { * toJavaObject() for the regular. * */ - private void testByRefToJavaObject(){ + public void testByRefToJavaObject(){ Variant v = null; Variant vByRef = null; v = new Variant(new Float(53.3),false); vByRef = new Variant(new Float(53.3),true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } v = new Variant(new Double(53.3),false); vByRef = new Variant(new Double(53.3),true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } @@ -67,7 +43,7 @@ class VariantTest { v = new Variant(new Boolean(true),false); vByRef = new Variant(new Boolean(true),true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } @@ -75,7 +51,7 @@ class VariantTest { v = new Variant(new Integer(53),false); vByRef = new Variant(new Integer(53),true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } @@ -83,7 +59,7 @@ class VariantTest { v = new Variant(new Short((short)53),false); vByRef = new Variant(new Short((short)53),true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } @@ -91,7 +67,7 @@ class VariantTest { v = new Variant("53.33",false); vByRef = new Variant("53.33",true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } @@ -100,7 +76,7 @@ class VariantTest { v = new Variant(now,false); vByRef = new Variant(now,true); if (!v.toJavaObject().equals(vByRef.toJavaObject())){ - System.out.println(v.toString() + " could not make type " + fail(v.toString() + " could not make type " + v.getvt() +" and "+ vByRef.getvt() +" java objects come out the same"); } @@ -113,7 +89,7 @@ class VariantTest { * instead of getDispatch so toString() on dispatch blows up. * */ - private void testDispatchToJavaObject(){ + public void testDispatchToJavaObject(){ Variant v2 = new Variant(); v2.putNothing(); // this test fails even though the exact same code below works fine @@ -124,7 +100,7 @@ class VariantTest { * see what happens when we conver to by ref * */ - private void testSomeChangeVT(){ + public void testSomeChangeVT(){ Variant v; // the code shows e shouldn't need to use a returned Variant but the test says we do Variant vConverted; @@ -135,7 +111,7 @@ class VariantTest { modifier = Variant.VariantShort; vConverted = v.changeType(modifier); if (vConverted.getvt() != modifier){ - System.out.println("Failed to change Variant "+originalVT + fail("Failed to change Variant "+originalVT + " using mask "+modifier + " resulted in "+vConverted.getvt() ); @@ -144,7 +120,7 @@ class VariantTest { modifier = Variant.VariantString; vConverted = v.changeType(modifier); if (vConverted.getvt() != modifier){ - System.out.println("Failed to change Variant "+originalVT + fail("Failed to change Variant "+originalVT + " using mask "+modifier + " resulted in "+vConverted.getvt() ); @@ -154,7 +130,7 @@ class VariantTest { modifier = Variant.VariantByref | Variant.VariantShort; vConverted = v.changeType(modifier); if (vConverted.getvt() == modifier){ - System.out.println("Should not have been able to change Variant "+originalVT + fail("Should not have been able to change Variant "+originalVT + " using mask "+modifier + " resulted in "+vConverted.getvt() ); @@ -165,7 +141,7 @@ class VariantTest { * make sure variant with no backing store works. * */ - private void testUninitializedVariant(){ + public void testUninitializedVariant(){ Variant v; // Variants created without parameters are auto set to VariantEmpty v = new Variant(); @@ -182,7 +158,7 @@ class VariantTest { try { v.toString(); } catch (IllegalStateException ise){ - System.out.println("toString() should never throw a runtime exception"); + fail("toString() should never throw a runtime exception"); throw new RuntimeException("toString() should not blow up even with uninitialized Variant"); } @@ -193,31 +169,31 @@ class VariantTest { * * verify the toString() method does not do type conversion */ - private void testToStringDoesNotConvert(){ + public void testToStringDoesNotConvert(){ Variant v; v = new Variant(true); v.toString(); if (v.getvt() != Variant.VariantBoolean){ throw new RuntimeException("toString() converted boolean to something else"); } else { - //System.out.println("toString() correctly does not convert type"); + //fail("toString() correctly does not convert type"); } if (v.getBoolean() != true){ - System.out.println("toString() converted boolean true to "+ v.getBoolean()); + fail("toString() converted boolean true to "+ v.getBoolean()); } v = new Variant(false); v.toString(); if (v.getvt() != Variant.VariantBoolean){ throw new RuntimeException("toString() converted boolean to something else"); } else { - //System.out.println("toString() correctly does not convert type"); + //fail("toString() correctly does not convert type"); } if (v.getBoolean() != false){ - System.out.println("toString() converted boolean false to "+ v.getBoolean()); + fail("toString() converted boolean false to "+ v.getBoolean()); } } - private void testSafeReleaseBoolean(){ + public void testSafeReleaseBoolean(){ Variant v; v = new Variant(true); //System.out.println("Newly created Variant ("+ v.getBoolean()+") "+ @@ -225,7 +201,7 @@ class VariantTest { v.safeRelease(); try { v.getBoolean(); - System.out.println("IllegalStateException should have been thrown when querying safeReleased object"); + fail("IllegalStateException should have been thrown when querying safeReleased object"); throw new RuntimeException("test failed"); } catch (IllegalStateException ise){ //System.out.println("IllegalStateException correctly thrown after safeRelease"); @@ -239,7 +215,7 @@ class VariantTest { ComThread.Release(); try { v.getBoolean(); - System.out.println("IllegalStateException should have been thrown when querying ComThread.Release"); + fail("IllegalStateException should have been thrown when querying ComThread.Release"); throw new RuntimeException("test failed"); } catch (IllegalStateException ise){ //System.out.println("IllegalStateException correctly thrown after ComThread.Release"); @@ -250,11 +226,11 @@ class VariantTest { * verify the constant values aren't released with safeRelease * */ - private void testSafeReleaseConstant(){ + public void testSafeReleaseConstant(){ //System.out.println("Using Static constant Variant - should never throw access violation"); Variant.VT_TRUE.safeRelease(); if (Variant.VT_TRUE.getBoolean() != true){ - System.out.println("VT_TRUE has been broken by SafeRelease()"); + fail("VT_TRUE has been broken by SafeRelease()"); throw new RuntimeException("test failed"); } else { //System.out.println("VT_TRUE survived SafeRelease()"); @@ -268,7 +244,7 @@ class VariantTest { ComThread.Release(); if (Variant.VT_TRUE.getBoolean() != true){ - System.out.println("VT_TRUE has been broken by ComThread.Release()"); + fail("VT_TRUE has been broken by ComThread.Release()"); throw new RuntimeException("test failed"); } else { //System.out.println("VT_TRUE survived ComThread.Release()"); @@ -282,7 +258,7 @@ class VariantTest { * working after a release * */ - private void testSafeReleaseString(){ + public void testSafeReleaseString(){ String mTestString = "Guitar Hero"; Variant v = new Variant(mTestString); //System.out.println("Newly created Variant ("+ v.getString()+") "+ @@ -290,7 +266,7 @@ class VariantTest { v.safeRelease(); try { v.getString(); - System.out.println("IllegalStateException should have been thrown when querying safeReleased object"); + fail("IllegalStateException should have been thrown when querying safeReleased object"); throw new RuntimeException("test failed"); } catch (IllegalStateException ise){ //System.out.println("IllegalStateException correctly thrown after safeRelease"); @@ -304,22 +280,22 @@ class VariantTest { public void testObjectIsAConstant(){ Variant v = new Variant("d"); if (!v.objectIsAConstant(Variant.VT_FALSE)){ - System.out.println("did not recognize VT_FALSE"); + fail("did not recognize VT_FALSE"); } if (!v.objectIsAConstant(Variant.VT_TRUE)){ - System.out.println("did not recognize VT_TRUE"); + fail("did not recognize VT_TRUE"); } if (!v.objectIsAConstant(Variant.VT_MISSING)){ - System.out.println("did not recognize VT_MISSING"); + fail("did not recognize VT_MISSING"); } if (!v.objectIsAConstant(Variant.DEFAULT)){ - System.out.println("did not recognize DEFAULT"); + fail("did not recognize DEFAULT"); } if (v.objectIsAConstant(new Variant(true))){ - System.out.println("confused a boolean with VT_TRUE"); + fail("confused a boolean with VT_TRUE"); } if (v.objectIsAConstant(new Variant(false))){ - System.out.println("confused a boolean with VT_FALSE"); + fail("confused a boolean with VT_FALSE"); } @@ -329,81 +305,81 @@ class VariantTest { * tests put and get methods looking for obvious defects * */ - private void testPutsAndGets(){ + public void testPutsAndGets(){ Variant v = new Variant(); v.putInt(10); if (v.getInt() != 10){ - System.out.println("int test failed"); + fail("int test failed"); } v.putShort((short)10); if (v.getShort() != 10){ - System.out.println("short test failed"); + fail("short test failed"); } v.putByte((byte)10); if (v.getByte() != 10){ - System.out.println("int test failed"); + fail("int test failed"); } v.putFloat(10); if (v.getFloat() != 10.0){ - System.out.println("float test failed"); + fail("float test failed"); } v.putDouble(10); if (v.getDouble() != 10.0){ - System.out.println("double test failed"); + fail("double test failed"); } v.putString("1234.567"); if (!"1234.567".equals(v.getString())){ - System.out.println("string test failed"); + fail("string test failed"); } v.putBoolean(true); if (v.getBoolean() != true){ - System.out.println("failed boolean test(true)"); + fail("failed boolean test(true)"); } v.putBoolean(false); if (v.getBoolean() != false){ - System.out.println("failed boolean test(false)"); + fail("failed boolean test(false)"); } v.putCurrency(123456789123456789L); if (v.getCurrency()!=123456789123456789L){ - System.out.println("failed currency test"); + fail("failed currency test"); } Date ourDate = new Date(); v.putDate(ourDate); Date retrievedDate = v.getJavaDate(); if (!retrievedDate.equals(ourDate)){ - System.out.println("failed java date load and unload"); + fail("failed java date load and unload"); } v.putNull(); if (!v.isNull()){ - System.out.println("failed detecting set null"); + fail("failed detecting set null"); } v.putString("something other than null"); if (v.isNull()){ - System.out.println("failed null replacement with string"); + fail("failed null replacement with string"); } v.putEmpty(); if (!v.isNull()){ - System.out.println("failed detecting set empty as null"); + fail("failed detecting set empty as null"); } v.putString("something other than null"); if (v.isNull()){ - System.out.println("failed empty replacement with string as isNull"); + fail("failed empty replacement with string as isNull"); } Variant v2 = new Variant(); v2.putNothing(); if (v2.getvt() != Variant.VariantDispatch){ - System.out.println("putNothing was supposed to set the type to VariantDispatch"); + fail("putNothing was supposed to set the type to VariantDispatch"); } if (!v2.isNull()){ - System.out.println("putNothing is supposed to cause isNull() to return true"); + fail("putNothing is supposed to cause isNull() to return true"); } // this line blows up in the test above if (v2.toJavaObject() == null){ - System.out.println("putNothing() followed by toJavaObject() should return a Dispatch"); + fail("putNothing() followed by toJavaObject() should return a Dispatch"); } } diff --git a/unittest/com/jacob/test/BaseTestCase.java b/unittest/com/jacob/test/BaseTestCase.java new file mode 100644 index 0000000..60823ea --- /dev/null +++ b/unittest/com/jacob/test/BaseTestCase.java @@ -0,0 +1,159 @@ +package com.jacob.test; + +import java.net.URL; + +import junit.framework.TestCase; + +import com.jacob.com.JacobObject; + +/** + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. Or try these: + * + * 

    + *      -Djava.library.path=d:/jacob/release/x86 
+ *      -Dcom.jacob.autogc=false 
+ *      -Dcom.jacob.debug=false 
+ *      -Xcheck:jni
+ *
    + */ +public class BaseTestCase extends TestCase { + + protected void setUp() { + // verify we have run with the dll in the lib path + try { + JacobObject foo = new JacobObject(); + if (foo == null) { + fail("Failed basic sanity test: Can't create JacobObject (-D)"); + } + } catch (UnsatisfiedLinkError ule) { + fail("Did you remember to run with the jacob.dll in the libpath ?"); + } + } + + /** + * this test exists just to test the setup. + */ + public void testSetup(){ + JacobObject foo = new JacobObject(); + assertNotNull(foo); + } + /** + * + * @return a simple VB script that generates the result "3" + */ + public String getSampleVPScriptForEval() { + return "1+(2*4)-3"; + + } + + /** + * Converts the class name into a path and appends the resource name. + * Used to derive the path to a resouce in the file system + * where the resource is co-located with the referenced class. + * + * @param resourceName + * @param classInSamePackageAsResource + * @return a class loader compatible fully qualified file system path to a resource + */ + public String getJavaFilePathToPackageResource(String resourceName, + Class classInSamePackageAsResource) { + + String classPackageName = classInSamePackageAsResource.getName(); + int i = classPackageName.lastIndexOf('.'); + if (i == -1) { + classPackageName = ""; + } else { + classPackageName = classPackageName.substring(0,i); + } + + // change all "." to ^ for later conversion to "/" so we can append resource names with "." + classPackageName = classPackageName.replace('.', '^'); + System.out.println("classPackageName:" + classPackageName); + + String fullPathToResource = (classPackageName.length() > 0 ? classPackageName + + "^" + : "") + + resourceName; + + fullPathToResource = fullPathToResource.replace('^', '/'); + System.out.println("fullPathToResource:" + fullPathToResource); + + URL urlToLibrary = + classInSamePackageAsResource.getClassLoader().getResource(fullPathToResource); + assertNotNull(urlToLibrary); + String fullPathToResourceAsFile = urlToLibrary.getFile(); + System.out.println("url to library: "+urlToLibrary); + System.out.println("fullPathToResourceAsFile: "+fullPathToResourceAsFile); + + return fullPathToResourceAsFile; + } + + /** + * Converts the class name into a path and appends the resource name. + * Used to derive the path to a resouce in the file system + * where the resource is co-located with the referenced class. + * + * @param resourceName + * @param classInSamePackageAsResource + * @return returns the path in the file system of the requested resource in windows c + * compatible format + */ + public String getWindowsFilePathToPackageResource( + String resourceName, Class classInSamePackageAsResource) { + String javaFilePath = getJavaFilePathToPackageResource( + resourceName, classInSamePackageAsResource); + javaFilePath = javaFilePath.replace('/', '\\'); + return javaFilePath.substring(1); + } + + /** + * + * @param resourceName + * @param classInSamePackageAsResource + * @return a resource located in the same package as the passed in class + */ + public Object getPackageResource(String resourceName, + Class classInSamePackageAsResource) { + String fullPathToResource = getJavaFilePathToPackageResource(resourceName, + classInSamePackageAsResource); + ClassLoader localClassLoader = classInSamePackageAsResource + .getClassLoader(); + if (null == localClassLoader) { + return ClassLoader.getSystemResource(fullPathToResource); + } else { + return localClassLoader.getResource(fullPathToResource); + } + } + + /** + * load a library from same place in the file system that the class was + * loaded from. + *

    + * This is an attempt to let unit tests run without having to run + * regsvr32. + * + * @param libraryName + * @param classInSamePackageAsResource + */ + public void loadLibraryFromClassPackage(String libraryName, + Class classInSamePackageAsResource) { + String libraryNameWithSuffix = ""; + String fullLibraryNameWithPath = ""; + if (libraryName != null && libraryName.endsWith("dll")) { + libraryNameWithSuffix = libraryName; + } else if (libraryName != null) { + libraryNameWithSuffix = libraryName + ".dll"; + } else { + fail("can't create full library name " + libraryName); + } + // generate the path the classloader would use to find this on the classpath + fullLibraryNameWithPath = getJavaFilePathToPackageResource( + libraryNameWithSuffix, classInSamePackageAsResource); + System.load(fullLibraryNameWithPath); + // requires that the dll be on the library path + //System.loadLibrary(fullLibraryNameWithPath); + } + +} diff --git a/unittest/com/jacob/test/events/ExcelEventTest.java b/unittest/com/jacob/test/events/ExcelEventTest.java index d1ce34b..24fcd10 100644 --- a/unittest/com/jacob/test/events/ExcelEventTest.java +++ b/unittest/com/jacob/test/events/ExcelEventTest.java @@ -6,6 +6,7 @@ import com.jacob.com.Dispatch; import com.jacob.com.DispatchEvents; import com.jacob.com.InvocationProxy; import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** * This test was lifted from a forum posting and shows how you can't listen to @@ -15,13 +16,13 @@ import com.jacob.com.Variant; * May need to run with some command line options (including from inside Eclipse). * Look in the docs area at the Jacob usage document for command line options. */ -public class ExcelEventTest extends InvocationProxy { +public class ExcelEventTest extends BaseTestCase { /** * load up excel, register for events and make stuff happen * @param args */ - public static void main(String args[]) { + public void testExcelWithInvocationProxy() { String pid = "Excel.Application"; String typeLibLocation = "C:\\Program Files\\Microsoft Office\\OFFICE11\\EXCEL.EXE"; @@ -31,9 +32,9 @@ public class ExcelEventTest extends InvocationProxy { // Add a listener (doesn't matter what it is). DispatchEvents de; if (typeLibLocation == null) { - de = new DispatchEvents(axc, new ExcelEventTest()); + de = new DispatchEvents(axc, new ExcelEvents()); } else { - de = new DispatchEvents(axc, new ExcelEventTest(), pid, + de = new DispatchEvents(axc, new ExcelEvents(), pid, typeLibLocation); } if (de == null) { @@ -67,16 +68,18 @@ public class ExcelEventTest extends InvocationProxy { } catch (ComException cfe) { cfe.printStackTrace(); - System.out.println("Failed to attach to " + pid + ": " + fail("Failed to attach to " + pid + ": " + cfe.getMessage()); } } + +public class ExcelEvents extends InvocationProxy { /** * Constructor so we can create an instance that implements invoke() */ - public ExcelEventTest() { + public ExcelEvents() { } /** @@ -89,3 +92,4 @@ public class ExcelEventTest extends InvocationProxy { } } +} diff --git a/unittest/com/jacob/test/events/IETest.java b/unittest/com/jacob/test/events/IETest.java index 15fdffd..cf564e0 100644 --- a/unittest/com/jacob/test/events/IETest.java +++ b/unittest/com/jacob/test/events/IETest.java @@ -1,7 +1,11 @@ package com.jacob.test.events; -import com.jacob.com.*; -import com.jacob.activeX.*; +import com.jacob.activeX.ActiveXComponent; +import com.jacob.com.ComThread; +import com.jacob.com.Dispatch; +import com.jacob.com.DispatchEvents; +import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** * This test runs fine against jdk 1.4 and 1.5 * @@ -15,10 +19,9 @@ import com.jacob.activeX.*; * Look in the docs area at the Jacob usage document for command line options. */ -class IETest -{ - public static void main(String[] args) - { +public class IETest extends BaseTestCase { + + public void testRunIE() { // this line starts the pump but it runs fine without it ComThread.startMainSTA(); // remove this line and it dies @@ -39,6 +42,10 @@ class IETest ComThread.quitMainSTA(); System.out.println("Main: did quit main sta in thread " +Thread.currentThread().getName()); + + if (aThread.threadFailedWithException != null){ + fail("caught an unexpected exception "+aThread.threadFailedWithException); + } } } @@ -46,6 +53,11 @@ class IETestThread extends Thread { public static boolean quitHandled = false; + /** + * holds any caught exception so the main/test case can see them + */ + public Throwable threadFailedWithException = null; + public IETestThread(){ super(); } @@ -80,8 +92,10 @@ class IETestThread extends Thread System.out.println("IETestThread: Did call navigate to yahoo"); try { Thread.sleep(delay); } catch (Exception e) {} } catch (Exception e) { + threadFailedWithException = e; e.printStackTrace(); } catch (Throwable re){ + threadFailedWithException = re; re.printStackTrace(); } finally { System.out.println("IETestThread: About to send Quit"); diff --git a/unittest/com/jacob/test/events/IETestActiveXProxy.java b/unittest/com/jacob/test/events/IETestActiveXProxy.java index 6cd90a2..7993189 100644 --- a/unittest/com/jacob/test/events/IETestActiveXProxy.java +++ b/unittest/com/jacob/test/events/IETestActiveXProxy.java @@ -5,6 +5,7 @@ import com.jacob.activeX.ActiveXDispatchEvents; import com.jacob.com.ComThread; import com.jacob.com.Dispatch; import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** * This test runs fine against jdk 1.4 and 1.5 * @@ -18,10 +19,10 @@ import com.jacob.com.Variant; * Look in the docs area at the Jacob usage document for command line options. */ -class IETestActiveXProxy -{ - public static void main(String[] args) - { +public class IETestActiveXProxy extends BaseTestCase { + + + public void testIEActiveProxyCallback() { // this line starts the pump but it runs fine without it ComThread.startMainSTA(); // remove this line and it dies @@ -42,6 +43,9 @@ class IETestActiveXProxy ComThread.quitMainSTA(); System.out.println("Main: did quit main sta in thread " +Thread.currentThread().getName()); + if (aThread.threadFailedWithException != null){ + fail("caught an unexpected exception "+aThread.threadFailedWithException); + } } } @@ -49,6 +53,11 @@ class IETestActiveProxyThread extends Thread { public static boolean quitHandled = false; + /** + * holds any caught exception so the main/test case can see them + */ + public Throwable threadFailedWithException = null; + public IETestActiveProxyThread(){ super(); } @@ -83,8 +92,10 @@ class IETestActiveProxyThread extends Thread System.out.println("IETestActiveProxyThread: Did call navigate to yahoo"); try { Thread.sleep(delay); } catch (Exception e) {} } catch (Exception e) { - e.printStackTrace(); + threadFailedWithException = e; + e.printStackTrace(); } catch (Throwable re){ + threadFailedWithException = re; re.printStackTrace(); } finally { System.out.println("IETestActiveProxyThread: About to send Quit"); diff --git a/unittest/com/jacob/test/events/WordEventTest.java b/unittest/com/jacob/test/events/WordEventTest.java index c6bb634..84f82c1 100644 --- a/unittest/com/jacob/test/events/WordEventTest.java +++ b/unittest/com/jacob/test/events/WordEventTest.java @@ -5,6 +5,7 @@ import com.jacob.com.ComException; import com.jacob.com.DispatchEvents; import com.jacob.com.InvocationProxy; import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** * This test was lifted from a forum posting and shows how you can't listen to @@ -17,13 +18,13 @@ import com.jacob.com.Variant; * May need to run with some command line options (including from inside Eclipse). * Look in the docs area at the Jacob usage document for command line options. */ -public class WordEventTest extends InvocationProxy { +public class WordEventTest extends BaseTestCase { /** * load up word, register for events and make stuff happen * @param args */ - public static void main(String args[]) { + public void testCaptureWordEvents() { String pid = "Word.Application"; String typeLibLocation = null; @@ -39,8 +40,7 @@ public class WordEventTest extends InvocationProxy { typeLibLocation); } if (de == null) { - System.out - .println("No exception thrown but no dispatch returned for Word events"); + fail("No exception thrown but no dispatch returned for Word events"); } else { // Yea! System.out.println("Successfully attached to " + pid); @@ -52,14 +52,13 @@ public class WordEventTest extends InvocationProxy { axc.setProperty("Visible",true); ActiveXComponent documents = axc.getPropertyAsComponent("Documents"); if (documents == null){ - System.out.println("unable to get documents"); + fail("unable to get documents"); } axc.invoke("Quit", new Variant[] {}); } catch (ComException cfe) { cfe.printStackTrace(); - System.out.println("Failed to attach to " + pid + ": " - + cfe.getMessage()); + fail("Failed to attach to " + pid + ": " + cfe.getMessage()); } System.out.println( @@ -68,10 +67,11 @@ public class WordEventTest extends InvocationProxy { "thinks we tested something"); } +public class WordEvents extends InvocationProxy { /** * Constructor so we can create an instance that implements invoke() */ - public WordEventTest() { + public WordEvents() { } /** @@ -83,3 +83,4 @@ public class WordEventTest extends InvocationProxy { } } +} \ No newline at end of file diff --git a/unittest/com/jacob/test/powerpoint/PowerpointTest.java b/unittest/com/jacob/test/powerpoint/PowerpointTest.java index f7cbbb2..0bb5b31 100644 --- a/unittest/com/jacob/test/powerpoint/PowerpointTest.java +++ b/unittest/com/jacob/test/powerpoint/PowerpointTest.java @@ -9,8 +9,10 @@ package com.jacob.test.powerpoint; * Look in the docs area at the Jacob usage document for command line options. */ import com.jacob.activeX.ActiveXComponent; +import com.jacob.com.ComFailException; import com.jacob.com.ComThread; import com.jacob.com.Dispatch; +import com.jacob.test.BaseTestCase; /** * @@ -18,67 +20,31 @@ import com.jacob.com.Dispatch; * The submitter stated they had the problem on windows 2000 with office 2000 * I have been unable to duplicate on windows XP with office 2003. * I am comitting this to the tree just in case we need to come back to it. + *

    + * This relies on BaseTestCase to provide the root path to the file under test + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. */ -public class PowerpointTest extends Thread { +public class PowerpointTest extends BaseTestCase { private static final int NUM_THREADS = 5; protected static final int NUM_ITERATIONS = 50; - private static String POWERPOINT_TEST_PATH = - "D:\\jacob\\samples\\com\\jacob\\test\\powerpoint"; - //"c:\\PowerpointTest\test"; - private int threadID; - private Dispatch comPowerpoint; - - public PowerpointTest(int threadID, Dispatch comPowerpoint) { - super("TestThread "+threadID); - this.threadID = threadID; - this.comPowerpoint = comPowerpoint; - } - - public void run() { - System.out.println("Thread \""+Thread.currentThread().getName()+"\" started"); - System.out.flush(); - ComThread.InitMTA(); - try { - for (int i=0; i + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. * */ -class sa_test { - public static void main(String[] args) { +public class SafeArrayBasicTest extends BaseTestCase { + public void testBasicSafeArray(){ //System.runFinalizersOnExit(true); SafeArray sa = new SafeArray(Variant.VariantVariant, 3); @@ -60,11 +65,9 @@ class sa_test { new Variant(1), new Variant(2.3), new Variant("hi") }); System.out.println("sa variant=" + sa); - sa_ND_test(); - } - public static void sa_ND_test() { + public void testSafeArrayNumDimensions() { int[] lowerBounds = new int[] { 0, 0, 0 }; int[] dimensionSizes = new int[] { 3, 3, 3 }; diff --git a/unittest/com/jacob/test/safearray/SafeArrayContents.java b/unittest/com/jacob/test/safearray/SafeArrayContents.java index 9de2ca7..b97a7c8 100644 --- a/unittest/com/jacob/test/safearray/SafeArrayContents.java +++ b/unittest/com/jacob/test/safearray/SafeArrayContents.java @@ -1,276 +1,273 @@ package com.jacob.test.safearray; -import com.jacob.com.*; +import com.jacob.com.ComFailException; +import com.jacob.com.SafeArray; +import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; -class SafeArrayContents -{ +/** + * A safe array contents test (old test) + * + *

    + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. + */ +public class SafeArrayContents extends BaseTestCase { - public static void printArray(boolean a[]) - { - System.out.print("["); - for(int i=0;i @@ -73,13 +74,15 @@ import com.jacob.com.Variant; +-----------+ | VT_ARRAY| +---------+ | parray---->SAFEARRAY| +------------+ +---------+ + * + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. */ -public class SafeArrayReleaseTest -{ +public class SafeArrayReleaseTest extends BaseTestCase { final static int MAX = 300; - public static void main(String[] args) - { + public void testSaveArrayRelease() { int count; System.out.println("Starting test for max = "+MAX); for(count = 1; count + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. + *

    + * This relies on BaseTestCase to provide the root path to the file under test + */ +public class SafeArrayViaExcel extends BaseTestCase { + public void testSafeArrayViaExcel() { + // deprecated + // System.runFinalizersOnExit(true); - ActiveXComponent xl = new ActiveXComponent("Excel.Application"); - try { - Dispatch cell; - SafeArray sAProdText; - Dispatch workbooks = xl.getProperty("Workbooks").toDispatch(); - System.out.println("have workbooks"); - Dispatch workbook = Dispatch.call(workbooks, "Open", "d:\\jacob\\samples\\test\\ExcelSafeArray" + - ".xls").toDispatch(); - System.out.println("Opened File - jacobtest.xls\n"); - Dispatch sheet = Dispatch.get(workbook,"ActiveSheet").toDispatch(); - cell = Dispatch.invoke(sheet,"Range",Dispatch.Get,new Object[] {"A1:D1000"},new int[1]).toDispatch(); - System.out.println("have cell:"+cell); - sAProdText = Dispatch.get(cell,"Value").toSafeArray(); - System.out.println("sa: dim="+sAProdText.getNumDim()); - System.out.println("sa: start row="+sAProdText.getLBound(1)); - System.out.println("sa: start col="+sAProdText.getLBound(2)); - System.out.println("sa: end row="+sAProdText.getUBound(1)); - System.out.println("sa: end col="+sAProdText.getUBound(2)); - int i; - int lineNumber=1; - int n = 0; - for(lineNumber=1; lineNumber < 1000; lineNumber++) - { - for (i = 1 ; i < 4 ; i++ ) { - System.out.println((n++) + " " + lineNumber+" "+i+" " +sAProdText.getString(lineNumber,i)); - /* - if (sAProdText.getString(lineNumber,i).compareTo("aaaa") != 0 ) { - System.out.println("Invalid String in line " + lineNumber + " Cell " + i + " Value = " + sAProdText.getString(lineNumber,i)); - stringFound = false; + ActiveXComponent xl = new ActiveXComponent("Excel.Application"); + try { + Dispatch cell; + SafeArray sAProdText; + Dispatch workbooks = xl.getProperty("Workbooks").toDispatch(); + System.out.println("have workbooks"); + Dispatch workbook = Dispatch.call( + workbooks, + "Open", + getWindowsFilePathToPackageResource("SafeArrayViaExcel.xls",this.getClass())) + .toDispatch(); + System.out.println("Opened File - SafeArrayViaExcel.xls\n"); + Dispatch sheet = Dispatch.get(workbook, "ActiveSheet").toDispatch(); + cell = Dispatch.invoke(sheet, "Range", Dispatch.Get, + new Object[] { "A1:D1000" }, new int[1]).toDispatch(); + System.out.println("have cell:" + cell); + sAProdText = Dispatch.get(cell, "Value").toSafeArray(); + System.out.println("sa: dim=" + sAProdText.getNumDim()); + System.out.println("sa: start row=" + sAProdText.getLBound(1)); + System.out.println("sa: start col=" + sAProdText.getLBound(2)); + System.out.println("sa: end row=" + sAProdText.getUBound(1)); + System.out.println("sa: end col=" + sAProdText.getUBound(2)); + int i; + int lineNumber = 1; + int n = 0; + for (lineNumber = 1; lineNumber < 1000; lineNumber++) { + for (i = 1; i < 4; i++) { + System.out.println((n++) + " " + lineNumber + " " + i + " " + + sAProdText.getString(lineNumber, i)); + /* + * if (sAProdText.getString(lineNumber,i).compareTo("aaaa") != + * 0 ) { System.out.println("Invalid String in line " + + * lineNumber + " Cell " + i + " Value = " + + * sAProdText.getString(lineNumber,i)); stringFound = false; } } + * if (stringFound) { System.out.println("Valid Strings in + * line " + lineNumber); lineNumber++; } + */ } } - if (stringFound) { - System.out.println("Valid Strings in line " + lineNumber); - lineNumber++; - } - */ - } + + Dispatch.call(workbook, "Close"); + System.out.println("Closed File\n"); + } catch (Exception e) { + e.printStackTrace(); + fail("Caught Exception "+e); + } finally { + xl.invoke("Quit", new Variant[] {}); } - - Dispatch.call(workbook, "Close"); - System.out.println("Closed File\n"); - } catch (Exception e) { - e.printStackTrace(); - } finally { - xl.invoke("Quit", new Variant[] {}); } - } } diff --git a/unittest/com/jacob/test/safearray/sa_dispatch.java b/unittest/com/jacob/test/safearray/sa_dispatch.java deleted file mode 100644 index 9c4caab..0000000 --- a/unittest/com/jacob/test/safearray/sa_dispatch.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jacob.test.safearray; - -import com.jacob.com.*; -import com.jacob.activeX.*; - -class sa_dispatch -{ - public static void main(String args[]) - { - // deprecated - //System.runFinalizersOnExit(true); - - try { - String lang = "VBScript"; - ActiveXComponent sC = new ActiveXComponent("ScriptControl"); - Dispatch sControl = (Dispatch)sC.getObject(); - Dispatch.put(sControl, "Language", lang); - - Variant result = Dispatch.call(sControl, "Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - - // wrap the script control in a variant - Variant v = new Variant(sControl); - - // create a safe array of type dispatch - SafeArray sa = new SafeArray(Variant.VariantDispatch, 1); - - // put the variant in the array - sa.setVariant(0, v); - - // take it back out - Variant v2 = sa.getVariant(0); - Dispatch d = v2.toDispatch(); - - // make sure you can call eval on it - result = Dispatch.call(d, "Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - } catch (ComException e) { - e.printStackTrace(); - } - } -} diff --git a/unittest/com/jacob/test/vbscript/ScriptTest.bat b/unittest/com/jacob/test/vbscript/ScriptTest.bat deleted file mode 100644 index 2db3461..0000000 --- a/unittest/com/jacob/test/vbscript/ScriptTest.bat +++ /dev/null @@ -1,2 +0,0 @@ -java ScriptTest "1+2" -java ScriptTest "()1+2" diff --git a/unittest/com/jacob/test/vbscript/ScriptTest.java b/unittest/com/jacob/test/vbscript/ScriptTest.java index b70039c..9eb2e7b 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTest.java +++ b/unittest/com/jacob/test/vbscript/ScriptTest.java @@ -1,50 +1,63 @@ package com.jacob.test.vbscript; import com.jacob.com.*; +import com.jacob.test.BaseTestCase; import com.jacob.activeX.*; /** - * In this case the component is created and used in the same thread - * and it's an Apartment Threaded component, so we call InitSTA. + * In this case the component is created and used in the same thread and it's an + * Apartment Threaded component, so we call InitSTA. + *

    + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. */ -class ScriptTest -{ - public static void main(String args[]) throws Exception - { - ComThread.InitSTA(true); - DispatchEvents de = null; - Dispatch sControl = null; +public class ScriptTest extends BaseTestCase { - try { - String lang = "VBScript"; - ActiveXComponent sC = new ActiveXComponent("ScriptControl"); - sControl = (Dispatch)sC.getObject(); - Dispatch.put(sControl, "Language", lang); - ScriptTestErrEvents te = new ScriptTestErrEvents(); - de = new DispatchEvents(sControl, te); - if (de == null){ - System.out.println("Received null when trying to create new DispatchEvents"); - } - Variant result = Dispatch.call(sControl, "Eval", args[0]); - // call it twice to see the objects reused - result = Dispatch.call(sControl, "Eval", args[0]); - // call it 3 times to see the objects reused - result = Dispatch.call(sControl, "Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - } catch (ComException e) { - e.printStackTrace(); - } - finally - { - Integer I = null; - for(int i=1;i<1000000;i++) - { - I = new Integer(i); - } - System.out.println(I); + public void testStupidSpeedTest() { + String lang = "VBScript"; + ActiveXComponent sC = new ActiveXComponent("ScriptControl"); + Dispatch sControl = sC.getObject(); + Dispatch.put(sControl, "Language", lang); + for (int i = 0; i < 10000; i++) { + Dispatch.call(sControl, "Eval", "1+1"); + } + } + + public void testCreatingDispatchEvents() { + ComThread.InitSTA(true); + DispatchEvents de = null; + Dispatch sControl = null; + + try { + String scriptCommand = getSampleVPScriptForEval(); + String lang = "VBScript"; + ActiveXComponent sC = new ActiveXComponent("ScriptControl"); + sControl = (Dispatch) sC.getObject(); + Dispatch.put(sControl, "Language", lang); + ScriptTestErrEvents te = new ScriptTestErrEvents(); + de = new DispatchEvents(sControl, te); + if (de == null) { + System.out + .println("Received null when trying to create new DispatchEvents"); + } + Variant result = Dispatch.call(sControl, "Eval", scriptCommand); + // call it twice to see the objects reused + result = Dispatch.call(sControl, "Eval", scriptCommand); + // call it 3 times to see the objects reused + result = Dispatch.call(sControl, "Eval", scriptCommand); + System.out.println("eval(" + scriptCommand + ") = " + result); + } catch (ComException e) { + e.printStackTrace(); + fail("Caught Exception " + e); + } finally { + Integer I = null; + for (int i = 1; i < 1000000; i++) { + I = new Integer(i); + } + System.out.println(I); ComThread.Release(); ComThread.quitMainSTA(); - } - } + } + } } - diff --git a/unittest/com/jacob/test/vbscript/ScriptTest2.java b/unittest/com/jacob/test/vbscript/ScriptTest2.java index 2add06e..0963b32 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTest2.java +++ b/unittest/com/jacob/test/vbscript/ScriptTest2.java @@ -1,98 +1,98 @@ package com.jacob.test.vbscript; import com.jacob.com.*; +import com.jacob.test.BaseTestCase; import com.jacob.activeX.*; /** - * This example demonstrates how to make calls between - * two different STA's. - * First, to create an STA, you need to extend the STA class - * and override its OnInit() method. This method will be called - * in the STA's thread so you can use it to create your COM - * components that will run in that STA. - * If you then try to call methods on those components from other - * threads (STA or MTA) - this will fail. - * You cannot create a component in an STA and call its methods - * from another thread. - * You can use the DispatchProxy to get a proxy to any Dispatch - * that lives in another STA. This object has to be created in the - * STA that houses the Dispatch (in this case it's created in the - * OnInit method). Then, another thread can call the toDispatch() - * method of DispatchProxy to get a local proxy. At most ONE (!) - * thread can call toDispatch(), and the call can be made only once. - * This is because a IStream object is used to pass the proxy, and - * it is only written once and closed when you read it. - * If you need multiple threads to access a Dispatch pointer, then - * create that many DispatchProxy objects. + * This example demonstrates how to make calls between two different STA's. + * First, to create an STA, you need to extend the STA class and override its + * OnInit() method. This method will be called in the STA's thread so you can + * use it to create your COM components that will run in that STA. If you then + * try to call methods on those components from other threads (STA or MTA) - + * this will fail. You cannot create a component in an STA and call its methods + * from another thread. You can use the DispatchProxy to get a proxy to any + * Dispatch that lives in another STA. This object has to be created in the STA + * that houses the Dispatch (in this case it's created in the OnInit method). + * Then, another thread can call the toDispatch() method of DispatchProxy to get + * a local proxy. At most ONE (!) thread can call toDispatch(), and the call can + * be made only once. This is because a IStream object is used to pass the + * proxy, and it is only written once and closed when you read it. If you need + * multiple threads to access a Dispatch pointer, then create that many + * DispatchProxy objects. + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. */ -class ScriptTest2 extends STA -{ - public static ActiveXComponent sC; - public static DispatchEvents de = null; - public static Dispatch sControl = null; - public static DispatchProxy sCon = null; - public boolean OnInit() - { - try - { - System.out.println("OnInit"); - System.out.println(Thread.currentThread()); - String lang = "VBScript"; - sC = new ActiveXComponent("ScriptControl"); - sControl = (Dispatch)sC.getObject(); +public class ScriptTest2 extends BaseTestCase { + public void testScript2() { + try { + ComThread.InitSTA(); + ScriptTestSTA script = new ScriptTestSTA(); + try { + Thread.sleep(1000); + } catch (InterruptedException ie){ + // should we get this? + } - // sCon can be called from another thread - sCon = new DispatchProxy(sControl); + String scriptCommand = getSampleVPScriptForEval(); + // get a thread-local Dispatch from sCon + Dispatch sc = script.sCon.toDispatch(); - Dispatch.put(sControl, "Language", lang); - ScriptTestErrEvents te = new ScriptTestErrEvents(); - de = new DispatchEvents(sControl, te); - return true; - } - catch (Exception e) - { - e.printStackTrace(); - return false; - } - } + // call a method on the thread-local Dispatch obtained + // from the DispatchProxy. If you try to make the same + // method call on the sControl object - you will get a + // ComException. + Variant result = Dispatch.call(sc, "Eval", scriptCommand); + System.out.println("eval(" + scriptCommand + ") = " + result); + script.quit(); + System.out.println("called quit"); + } catch (ComException e) { + e.printStackTrace(); + fail("caught exception"+e); + } finally { + Integer I = null; + for (int i = 1; i < 1000000; i++) { + I = new Integer(i); + } + System.out.println(I); + ComThread.Release(); + } + } - public void OnQuit() - { - System.out.println("OnQuit"); - } + public class ScriptTestSTA extends STA { - public static void main(String args[]) throws Exception - { - try { - ComThread.InitSTA(); - ScriptTest2 script = new ScriptTest2(); - Thread.sleep(1000); + public DispatchEvents de = null; - // get a thread-local Dispatch from sCon - Dispatch sc = sCon.toDispatch(); + public Dispatch sControl = null; + + public DispatchProxy sCon = null; + + public boolean OnInit() { + try { + System.out.println("OnInit"); + System.out.println(Thread.currentThread()); + String lang = "VBScript"; + sControl = new ActiveXComponent("ScriptControl"); + + // sCon can be called from another thread + sCon = new DispatchProxy(sControl); + + Dispatch.put(sControl, "Language", lang); + ScriptTestErrEvents te = new ScriptTestErrEvents(); + de = new DispatchEvents(sControl, te); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + public void OnQuit() { + System.out.println("OnQuit"); + } + + } - // call a method on the thread-local Dispatch obtained - // from the DispatchProxy. If you try to make the same - // method call on the sControl object - you will get a - // ComException. - Variant result = Dispatch.call(sc, "Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - script.quit(); - System.out.println("called quit"); - } catch (ComException e) { - e.printStackTrace(); - } - finally - { - Integer I = null; - for(int i=1;i<1000000;i++) - { - I = new Integer(i); - } - System.out.println(I); - ComThread.Release(); - } - } } - diff --git a/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java b/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java index 08b38fa..17da960 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java +++ b/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java @@ -1,96 +1,102 @@ package com.jacob.test.vbscript; -import com.jacob.com.*; -import com.jacob.activeX.*; +import com.jacob.activeX.ActiveXComponent; +import com.jacob.com.ComException; +import com.jacob.com.ComThread; +import com.jacob.com.DispatchEvents; +import com.jacob.com.DispatchProxy; +import com.jacob.com.STA; +import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** - * This example demonstrates how to make calls between - * two different STA's. - * First, to create an STA, you need to extend the STA class - * and override its OnInit() method. This method will be called - * in the STA's thread so you can use it to create your COM - * components that will run in that STA. - * If you then try to call methods on those components from other - * threads (STA or MTA) - this will fail. - * You cannot create a component in an STA and call its methods - * from another thread. - * You can use the DispatchProxy to get a proxy to any Dispatch - * that lives in another STA. This object has to be created in the - * STA that houses the Dispatch (in this case it's created in the - * OnInit method). Then, another thread can call the toDispatch() - * method of DispatchProxy to get a local proxy. At most ONE (!) - * thread can call toDispatch(), and the call can be made only once. - * This is because a IStream object is used to pass the proxy, and - * it is only written once and closed when you read it. - * If you need multiple threads to access a Dispatch pointer, then - * create that many DispatchProxy objects. + * This example demonstrates how to make calls between two different STA's. + * First, to create an STA, you need to extend the STA class and override its + * OnInit() method. This method will be called in the STA's thread so you can + * use it to create your COM components that will run in that STA. If you then + * try to call methods on those components from other threads (STA or MTA) - + * this will fail. You cannot create a component in an STA and call its methods + * from another thread. You can use the DispatchProxy to get a proxy to any + * Dispatch that lives in another STA. This object has to be created in the STA + * that houses the Dispatch (in this case it's created in the OnInit method). + * Then, another thread can call the toDispatch() method of DispatchProxy to get + * a local proxy. At most ONE (!) thread can call toDispatch(), and the call can + * be made only once. This is because a IStream object is used to pass the + * proxy, and it is only written once and closed when you read it. If you need + * multiple threads to access a Dispatch pointer, then create that many + * DispatchProxy objects. + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. */ -class ScriptTest2ActiveX extends STA -{ - public static ActiveXComponent sC; - public static DispatchEvents de = null; - public static DispatchProxy sCon = null; +public class ScriptTest2ActiveX extends BaseTestCase { + public static ActiveXComponent sC; - public boolean OnInit() - { - try - { - System.out.println("OnInit"); - System.out.println(Thread.currentThread()); - String lang = "VBScript"; - sC = new ActiveXComponent("ScriptControl"); + public static DispatchEvents de = null; - // sCon can be called from another thread - sCon = new DispatchProxy(sC); + public static DispatchProxy sCon = null; - sC.setProperty("Language", lang); - ScriptTestErrEvents te = new ScriptTestErrEvents(); - de = new DispatchEvents(sC, te); - return true; - } - catch (Exception e) - { - e.printStackTrace(); - return false; - } - } + public void testActiveXSTA() { + try { + ComThread.InitSTA(); + ScriptTest2ActiveXSTA script = new ScriptTest2ActiveXSTA(); + try { + Thread.sleep(1000); + } catch (InterruptedException ie){ + // should we get this? + } - public void OnQuit() - { - System.out.println("OnQuit"); - } + // get a thread-local Dispatch from sCon + ActiveXComponent sc = new ActiveXComponent(sCon.toDispatch()); - public static void main(String args[]) throws Exception - { - try { - ComThread.InitSTA(); - ScriptTest2ActiveX script = new ScriptTest2ActiveX(); - Thread.sleep(1000); + // call a method on the thread-local Dispatch obtained + // from the DispatchProxy. If you try to make the same + // method call on the sControl object - you will get a + // ComException. + String scriptCommand = getSampleVPScriptForEval(); + Variant result = sc.invoke("Eval", scriptCommand); + System.out.println("eval(" + scriptCommand + ") = " + result); + script.quit(); + System.out.println("called quit"); + } catch (ComException e) { + e.printStackTrace(); + fail("blew up with Com Exception "+e); + } finally { + Integer I = null; + for (int i = 1; i < 1000000; i++) { + I = new Integer(i); + } + System.out.println(I); + ComThread.Release(); + } + } - // get a thread-local Dispatch from sCon - ActiveXComponent sc = new ActiveXComponent(sCon.toDispatch()); + public class ScriptTest2ActiveXSTA extends STA { - // call a method on the thread-local Dispatch obtained - // from the DispatchProxy. If you try to make the same - // method call on the sControl object - you will get a - // ComException. - Variant result = sc.invoke("Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - script.quit(); - System.out.println("called quit"); - } catch (ComException e) { - e.printStackTrace(); - } - finally - { - Integer I = null; - for(int i=1;i<1000000;i++) - { - I = new Integer(i); - } - System.out.println(I); - ComThread.Release(); - } - } -} + public boolean OnInit() { + try { + System.out.println("OnInit"); + System.out.println(Thread.currentThread()); + String lang = "VBScript"; + sC = new ActiveXComponent("ScriptControl"); + // sCon can be called from another thread + sCon = new DispatchProxy(sC); + + sC.setProperty("Language", lang); + ScriptTestErrEvents te = new ScriptTestErrEvents(); + de = new DispatchEvents(sC, te); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + public void OnQuit() { + System.out.println("OnQuit"); + } + + } + +} \ No newline at end of file diff --git a/unittest/com/jacob/test/vbscript/ScriptTest3.java b/unittest/com/jacob/test/vbscript/ScriptTest3.java index 77f8a16..51c29b3 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTest3.java +++ b/unittest/com/jacob/test/vbscript/ScriptTest3.java @@ -1,68 +1,73 @@ package com.jacob.test.vbscript; import com.jacob.com.*; +import com.jacob.test.BaseTestCase; import com.jacob.activeX.*; /** - * Here we create the ScriptControl component in a separate MTA thread - * and then call the Eval method from the main thread. The main thread - * must also be an MTA thread. If you try to create it as an STA - * then you will not be able to make calls into a component running - * in another thread. + * Here we create the ScriptControl component in a separate MTA thread and then + * call the Eval method from the main thread. The main thread must also be an + * MTA thread. If you try to create it as an STA then you will not be able to + * make calls into a component running in another thread. + *

    + * May need to run with some command line options (including from inside Eclipse). + * Look in the docs area at the Jacob usage document for command line options. */ -class ScriptTest3 extends Thread -{ - public static ActiveXComponent sC; - public static DispatchEvents de = null; - public static Dispatch sControl = null; - public static boolean quit = false; +public class ScriptTest3 extends BaseTestCase { - public void run() - { - try - { - ComThread.InitMTA(); - System.out.println("OnInit"); - String lang = "VBScript"; - sC = new ActiveXComponent("ScriptControl"); - sControl = (Dispatch)sC.getObject(); - Dispatch.put(sControl, "Language", lang); - ScriptTestErrEvents te = new ScriptTestErrEvents(); - de = new DispatchEvents(sControl, te); - System.out.println("sControl="+sControl); - while (!quit) sleep(100); - ComThread.Release(); - } - catch (Exception e) - { - e.printStackTrace(); - } - finally - { - System.out.println("worker thread exits"); - } - } + public static ActiveXComponent sC; - public static void main(String args[]) throws Exception - { - try { - ComThread.InitMTA(); - ScriptTest3 script = new ScriptTest3(); - script.start(); - Thread.sleep(1000); + public static DispatchEvents de = null; - Variant result = Dispatch.call(sControl, "Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - System.out.println("setting quit"); - ScriptTest3.quit = true; - } catch (ComException e) { - e.printStackTrace(); - } - finally - { - System.out.println("main done"); - ComThread.Release(); - } - } + public static Dispatch sControl = null; + + public static boolean quit = false; + + public void testScript() { + try { + ComThread.InitMTA(); + ScriptTest3Inner script = new ScriptTest3Inner(); + script.start(); + try { + Thread.sleep(1000); + } catch (InterruptedException ie){ + // should we get this? + } + + Variant result = Dispatch.call(sControl, "Eval", getSampleVPScriptForEval()); + System.out.println("eval(" + getSampleVPScriptForEval() + ") = " + result); + System.out.println("setting quit"); + ScriptTest3.quit = true; + } catch (ComException e) { + e.printStackTrace(); + fail("Caught excpetion running script with MTA"); + } finally { + System.out.println("main done"); + ComThread.Release(); + } + } + + class ScriptTest3Inner extends Thread { + public void run() { + try { + ComThread.InitMTA(); + System.out.println("OnInit"); + String lang = "VBScript"; + sC = new ActiveXComponent("ScriptControl"); + sControl = (Dispatch) sC.getObject(); + Dispatch.put(sControl, "Language", lang); + ScriptTestErrEvents te = new ScriptTestErrEvents(); + de = new DispatchEvents(sControl, te); + System.out.println("sControl=" + sControl); + while (!quit) + sleep(100); + ComThread.Release(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + System.out.println("worker thread exits"); + } + } + + } } - diff --git a/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java b/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java index 7578ddf..1a20f53 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java +++ b/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java @@ -1,66 +1,72 @@ package com.jacob.test.vbscript; import com.jacob.com.*; +import com.jacob.test.BaseTestCase; import com.jacob.activeX.*; /** - * Here we create the ScriptControl component in a separate MTA thread - * and then call the Eval method from the main thread. The main thread - * must also be an MTA thread. If you try to create it as an STA - * then you will not be able to make calls into a component running - * in another thread. + * Here we create the ScriptControl component in a separate MTA thread and then + * call the Eval method from the main thread. The main thread must also be an + * MTA thread. If you try to create it as an STA then you will not be able to + * make calls into a component running in another thread. + *

    + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. */ -class ScriptTest3ActiveX extends Thread -{ - public static ActiveXComponent sC; - public static DispatchEvents de = null; - public static boolean quit = false; +public class ScriptTest3ActiveX extends BaseTestCase { + public static ActiveXComponent sC; - public void run() - { - try - { - ComThread.InitMTA(); - System.out.println("OnInit"); - String lang = "VBScript"; - sC = new ActiveXComponent("ScriptControl"); - sC.setProperty("Language", lang); - ScriptTestErrEvents te = new ScriptTestErrEvents(); - de = new DispatchEvents(sC, te); - System.out.println("sControl="+sC); - while (!quit) sleep(100); - ComThread.Release(); - } - catch (Exception e) - { - e.printStackTrace(); - } - finally - { - System.out.println("worker thread exits"); - } - } + public static DispatchEvents de = null; - public static void main(String args[]) throws Exception - { - try { - ComThread.InitMTA(); - ScriptTest3ActiveX script = new ScriptTest3ActiveX(); - script.start(); - Thread.sleep(1000); + public static boolean quit = false; - Variant result = sC.invoke("Eval", args[0]); - System.out.println("eval("+args[0]+") = "+ result); - System.out.println("setting quit"); - ScriptTest3ActiveX.quit = true; - } catch (ComException e) { - e.printStackTrace(); - } - finally - { - System.out.println("main done"); - ComThread.Release(); - } - } + public void testYetAnotherScriptTest() { + try { + ComThread.InitMTA(); + ScriptTest3ActiveXInner script = new ScriptTest3ActiveXInner(); + script.start(); + try { + Thread.sleep(1000); + } catch (InterruptedException ie) { + // should we get this? + } + + Variant result = sC.invoke("Eval", getSampleVPScriptForEval()); + System.out + .println("eval(" + getSampleVPScriptForEval() + + ") = " + result); + System.out.println("setting quit"); + ScriptTest3ActiveX.quit = true; + } catch (ComException e) { + e.printStackTrace(); + fail("Caught ComException " + e); + } finally { + System.out.println("main done"); + ComThread.Release(); + } + } + + public class ScriptTest3ActiveXInner extends Thread { + public void run() { + try { + ComThread.InitMTA(); + System.out.println("OnInit"); + String lang = "VBScript"; + sC = new ActiveXComponent("ScriptControl"); + sC.setProperty("Language", lang); + ScriptTestErrEvents te = new ScriptTestErrEvents(); + de = new DispatchEvents(sC, te); + System.out.println("sControl=" + sC); + while (!quit) + sleep(100); + ComThread.Release(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + System.out.println("worker thread exits"); + } + } + + } } - diff --git a/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java b/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java index 0d94b56..9d3a57a 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java +++ b/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java @@ -1,16 +1,19 @@ package com.jacob.test.vbscript; import com.jacob.com.*; +import com.jacob.test.BaseTestCase; import com.jacob.activeX.*; /** * In this case the component is created and used in the same thread * and it's an Apartment Threaded component, so we call InitSTA. + *

    + * May need to run with some command line options (including from inside + * Eclipse). Look in the docs area at the Jacob usage document for command line + * options. */ -class ScriptTestActiveX -{ - public static void main(String args[]) throws Exception - { +public class ScriptTestActiveX extends BaseTestCase { + public void testActiveXScript() { ComThread.InitSTA(true); DispatchEvents de = null; @@ -24,12 +27,12 @@ class ScriptTestActiveX System.out.println("null returned when trying to create DispatchEvents"); } Variant result; - result = sC.invoke("Eval",args[0]); + result = sC.invoke("Eval",getSampleVPScriptForEval()); // call it twice to see the objects reused - result = sC.invoke("Eval",args[0]); + result = sC.invoke("Eval",getSampleVPScriptForEval()); // call it 3 times to see the objects reused - result = sC.invoke("Eval",args[0]); - System.out.println("eval("+args[0]+") = "+ result); + result = sC.invoke("Eval",getSampleVPScriptForEval()); + System.out.println("eval("+getSampleVPScriptForEval()+") = "+ result); } catch (ComException e) { e.printStackTrace(); } diff --git a/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java b/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java index 1133fe1..9be2f38 100644 --- a/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java +++ b/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java @@ -1,12 +1,13 @@ - package com.jacob.test.vbscript; import com.jacob.com.Variant; +import com.jacob.test.BaseTestCase; /** * Extracted from ScriptTest so everyone can see this + * Made a test solely because it made the ant test easier */ -public class ScriptTestErrEvents { +public class ScriptTestErrEvents extends BaseTestCase { public void Error(Variant[] args) { diff --git a/unittest/com/jacob/test/vbscript/speed.java b/unittest/com/jacob/test/vbscript/speed.java deleted file mode 100644 index 778da05..0000000 --- a/unittest/com/jacob/test/vbscript/speed.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jacob.test.vbscript; - -import com.jacob.com.*; -import com.jacob.activeX.*; - -class speed -{ - public static void main(String args[]) - { - String lang = "VBScript"; - ActiveXComponent sC = new ActiveXComponent("ScriptControl"); - Dispatch sControl = sC.getObject(); - Dispatch.put(sControl, "Language", lang); - for(int i=0;i<10000;i++) { - Dispatch.call(sControl, "Eval", "1+1"); - } - } -} diff --git a/unittest/com/jacob/test/windowsmedia/WMPlayer.java b/unittest/com/jacob/test/windowsmedia/WMPlayer.java index 831c470..4f7e152 100644 --- a/unittest/com/jacob/test/windowsmedia/WMPlayer.java +++ b/unittest/com/jacob/test/windowsmedia/WMPlayer.java @@ -9,20 +9,22 @@ package com.jacob.test.windowsmedia; * Look in the docs area at the Jacob usage document for command line options. */ import com.jacob.activeX.*; +import com.jacob.test.BaseTestCase; -public class WMPlayer { +public class WMPlayer extends BaseTestCase { - public static void main(String[] args){ + public void testOpenWMPlayer() { ActiveXComponent wmp = null; wmp = new ActiveXComponent("WMPlayer.OCX"); - - // the sourceforge posting didn't post all the code so this is all we have - // we need some other information on how to set the document + + // the sourceforge posting didn't post all the code so this is all we + // have we need some other information on how to set the document // so that we have a url to open - for ( int i= 0 ; i < 1000 ; i++){ - System.out.println("the wmp url is "+ wmp.getProperty("URL").toString()); + for (int i = 0; i < 1000; i++) { + System.out.println("the wmp url is " + + wmp.getProperty("URL").toString()); } - - } - + + } + }