From f16721c64008697a5b37c002f3b201d15e556c7a Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Sat, 3 Oct 2009 08:18:57 +0200 Subject: Added jni test; changed goals for running run-its tests --- ReleaseNotes.txt | 12 ++++ pom.xml | 9 ++- src/it/executable/pom.xml | 8 +++ src/it/jni/pom.xml | 81 ++++++++++++++++++++++ src/it/jni/src/main/c/HelloWorldJNI.c | 16 +++++ .../com/mycompany/mypackage/HelloWorldJNI.java | 15 ++++ src/it/jni/src/test/java/HelloWorldJNITest.java | 25 +++++++ src/site/apt/HelloWorld.apt | 6 +- 8 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 src/it/jni/pom.xml create mode 100644 src/it/jni/src/main/c/HelloWorldJNI.c create mode 100644 src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java create mode 100644 src/it/jni/src/test/java/HelloWorldJNITest.java diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e2cc31a..83838d3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -13,6 +13,18 @@ and cpptasks-parallel. Bugs +- Excecutable needs a test to run and verify the output of Executable. + +- When it test fails it seems not reported in main pom, refer to executable + +- nar-integration (our plugin copy) tests are not run when maven.tests.skip=true is set... +while they are run when in the configuration (plugin has different name) skip is set. + +- When run from run-its, executable fails to create. The build file shows: + +Error looking up lifecycle mapping to retrieve optional mojos. Lifecycle ID: default. Error: Component descriptor cannot be found in the component repository: org.apache.maven.lifecycle.mapping.LifecycleMappingnar. +org.codehaus.plexus.component.repository.exception.ComponentLookupException: Component descriptor cannot be found in the component repository: org.apache.maven.lifecycle.mapping.LifecycleMappingnar. + - When the calculated AOL is not found in aol.properties the error message is misleading: [INFO] [nar:nar-download {execution: default-nar-download}] diff --git a/pom.xml b/pom.xml index a752945..ee721d6 100644 --- a/pom.xml +++ b/pom.xml @@ -131,11 +131,18 @@ maven-invoker-plugin 1.4 - true + false + it-parent/** ${project.build.directory}/it-repo + + clean + integration-test + diff --git a/src/it/executable/pom.xml b/src/it/executable/pom.xml index 00bf1c8..98b664e 100644 --- a/src/it/executable/pom.xml +++ b/src/it/executable/pom.xml @@ -39,9 +39,11 @@ under the License. http://maven.apache.org/ + integration-test @@ -58,6 +60,12 @@ under the License. + + maven-surefire-plugin + + true + + diff --git a/src/it/jni/pom.xml b/src/it/jni/pom.xml new file mode 100644 index 0000000..486ac48 --- /dev/null +++ b/src/it/jni/pom.xml @@ -0,0 +1,81 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.nar + it-parent + 1.0-SNAPSHOT + ../it-parent/pom.xml + + + jni + nar + + Maven NAR JNI Test + 1.0-SNAPSHOT + + Simple JNI Library + + http://maven.apache.org/ + + + integration-test + + + maven-nar-plugin + true + + + true + + + + jni + com.mycompany.mypackage + false + + + + + + maven-surefire-plugin + + true + + + + + + + junit + junit + 3.8.2 + test + + + diff --git a/src/it/jni/src/main/c/HelloWorldJNI.c b/src/it/jni/src/main/c/HelloWorldJNI.c new file mode 100644 index 0000000..716722e --- /dev/null +++ b/src/it/jni/src/main/c/HelloWorldJNI.c @@ -0,0 +1,16 @@ +#include +#include "com_mycompany_mypackage_HelloWorldJNI.h" + +JNIEXPORT jstring JNICALL Java_com_mycompany_mypackage_HelloWorldJNI_sayHello( JNIEnv *env, jobject obj ) { + jstring value; /* the return value */ + + char buf[40]; /* working buffer (really only need 20 ) */ + + + sprintf ( buf, "%s", "Hello NAR World!" ); + + value = (*env)->NewStringUTF( env, buf ); + + return value; +} + diff --git a/src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java b/src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java new file mode 100644 index 0000000..2af3f3c --- /dev/null +++ b/src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java @@ -0,0 +1,15 @@ +package com.mycompany.mypackage; + +public class HelloWorldJNI { + static { + NarSystem.loadLibrary(); + } + + public native String sayHello(); + + public static void main( String[] args ) { + HelloWorldJNI app = new HelloWorldJNI(); + System.out.println( app.sayHello() ); + } +} + diff --git a/src/it/jni/src/test/java/HelloWorldJNITest.java b/src/it/jni/src/test/java/HelloWorldJNITest.java new file mode 100644 index 0000000..683c321 --- /dev/null +++ b/src/it/jni/src/test/java/HelloWorldJNITest.java @@ -0,0 +1,25 @@ +import junit.framework.*; + +import com.mycompany.mypackage.HelloWorldJNI; + +public class HelloWorldJNITest extends TestCase { + + public HelloWorldJNITest(String name) { + super(name); + } + + protected void setUp() throws Exception { + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testNativeHelloWorldJNI() throws Exception { + HelloWorldJNI app = new HelloWorldJNI(); + + this.assertEquals( "Hello NAR World!", app.sayHello() ); + } +} + diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt index 7d1f2aa..3a11ce5 100644 --- a/src/site/apt/HelloWorld.apt +++ b/src/site/apt/HelloWorld.apt @@ -19,14 +19,14 @@ There are also some unit test which are run and call the same method. [] - [helloworldjni] A C routine called from Java and a Java unit test. + [jni] A C routine called from Java and a Java unit test. - [helloworldjnilibjava] A java project which depends on helloworldjni. + [helloworldjnilibjava] A java project which depends on "jni". [helloworldstaticjni] A C routine called from Java statically linked with the C-runtime library and a Java unit test. [hellothirdpartyjni] A third party JNI library called from Java. - The third party library is "helloworldjni" and is added as resource to the project in the + The third party library is "jni" and is added as resource to the project in the form of a JNI library and a corresponding jar file. A Java unit test is provided. [] -- cgit v1.2.3