summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/it/it-parent/pom.xml15
-rw-r--r--src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java25
-rw-r--r--src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java24
-rw-r--r--src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java24
-rw-r--r--src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java24
-rw-r--r--src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java25
-rw-r--r--src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java26
7 files changed, 33 insertions, 130 deletions
diff --git a/src/it/it-parent/pom.xml b/src/it/it-parent/pom.xml
index 44a0010..c6fe072 100644
--- a/src/it/it-parent/pom.xml
+++ b/src/it/it-parent/pom.xml
@@ -56,12 +56,25 @@ under the License.
</snapshots>
</pluginRepository>
</pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java b/src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java
index cfbf1db..718acb4 100644
--- a/src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java
+++ b/src/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java
@@ -20,35 +20,16 @@ package it0003.test;
*/
import it0003.HelloWorldJNI;
-import junit.framework.*;
-
+import org.junit.Assert;
+import org.junit.Test;
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();
- }
-
+ @Test
public void testNativeHelloWorldJNI()
throws Exception
{
HelloWorldJNI app = new HelloWorldJNI();
-
Assert.assertEquals( "Hello NAR World!", app.sayHello() );
}
}
diff --git a/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java b/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java
index 7eda5ec..00686d6 100644
--- a/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java
+++ b/src/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java
@@ -19,31 +19,13 @@ package it0004.test;
* under the License.
*/
-import junit.framework.*;
-
import it0003.HelloWorldJNI;
+import org.junit.Assert;
+import org.junit.Test;
public class HelloWorldJavaDepJNITest
- extends TestCase
{
-
- public HelloWorldJavaDepJNITest( String name )
- {
- super( name );
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testNativeHelloWorldJavaDepJNI()
throws Exception
{
diff --git a/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
index 45cb048..50d45fe 100644
--- a/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
+++ b/src/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java
@@ -20,30 +20,12 @@ package it0005.test;
*/
import it0005.HelloWorldStaticJNI;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
public class HelloWorldStaticJNITest
- extends TestCase
{
-
- public HelloWorldStaticJNITest( String name )
- {
- super( name );
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testNativeHelloWorldJNI()
throws Exception
{
diff --git a/src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java b/src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java
index db6b80c..178cdef 100644
--- a/src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java
+++ b/src/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java
@@ -20,30 +20,12 @@ package it0006.test;
*/
import it0003.HelloWorldJNI;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
public class HelloThirdPartyJNITest
- extends TestCase
{
-
- public HelloThirdPartyJNITest( String name )
- {
- super( name );
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testNativeHelloThirdPartyJNI()
throws Exception
{
diff --git a/src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java b/src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java
index 5b9adc9..e1e9af1 100644
--- a/src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java
+++ b/src/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java
@@ -20,31 +20,12 @@ package it0009.test;
*/
import it0009.HelloWorldSharedLibJNI;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
+import org.junit.Assert;
+import org.junit.Test;
public class HelloWorldSharedLibJNITest
- extends TestCase
{
-
- public HelloWorldSharedLibJNITest( String name )
- {
- super( name );
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testNativeHelloWorldSharedLibJNI()
throws Exception
{
diff --git a/src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java b/src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java
index b3aac5c..28dedd1 100644
--- a/src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java
+++ b/src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java
@@ -1,4 +1,5 @@
package it0012.test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,31 +20,12 @@ package it0012.test;
*/
import it0012.HelloWorldSharedLibJNI;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
+import org.junit.Assert;
+import org.junit.Test;
public class HelloWorldSharedLibJNITest
- extends TestCase
{
-
- public HelloWorldSharedLibJNITest( String name )
- {
- super( name );
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
+ @Test
public void testNativeHelloWorldSharedLibJNI()
throws Exception
{