Fixed tests 6, 11 and 12

10 files changed, 79 insertions, 202 deletions

diff --git a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml
deleted file mode 100644
index b06ee18..0000000
--- a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.nar</groupId>
-    <artifactId>it0012-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0012-jni-dep-lib-static</artifactId>
-  <packaging>nar</packaging>
-
-  <name>Maven NAR JNI</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>
-    JNI
-  </description>
-
-  <build>
-    <defaultGoal>integration-test</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <libraries>
-            <library>
-              <type>jni</type>
-              <narSystemPackage>com.mycompany.mypackage</narSystemPackage>
-              <linkCPP>false</linkCPP>
-            </library>
-          </libraries>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.nar</groupId>
-      <artifactId>it0012-lib-static</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c b/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c
deleted file mode 100644
index e5b8e4b..0000000
--- a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-#include "com_mycompany_mypackage_HelloWorldSharedLibJNI.h"
-
-JNIEXPORT jstring JNICALL Java_com_mycompany_mypackage_HelloWorldSharedLibJNI_sayHello( JNIEnv *env, jobject obj ) {
-	jstring value;           /* the return value */
-
-	char buf[80];            /* working buffer (really only need 20 ) */
-
-	sprintf ( buf, "%s", HelloWorldLib_sayHello());
-
-	value = (*env)->NewStringUTF( env, buf );
-
-	return value;
-}
-
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/lib-static/pom.xml
deleted file mode 100644
index 034b27f..0000000
--- a/src/it/it0012-jni-dep-lib-static/lib-static/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.nar</groupId>
-    <artifactId>it0012-pom</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it0012-lib-static</artifactId>
-  <packaging>nar</packaging>
-  
-  <name>Maven NAR Static Library</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>
-    Simple static library and test file
-  </description>
-  <url>http://maven.apache.org/</url>
-<!--
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
--->  
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <plugins>
-      <plugin>
-        <artifactId>maven-nar-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <libraries>
-            <library>
-              <type>static</type>
-            </library>
-          </libraries>
-          <tests>
-            <test>
-              <name>HelloWorldTest</name>
-              <link>static</link>
-            </test>
-          </tests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c b/src/it/it0012-jni-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
deleted file mode 100644
index 9f65143..0000000
--- a/src/it/it0012-jni-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-char* HelloWorldLib_sayHello() {
-	return "Hello NAR LIB World!";
-}
-
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h b/src/it/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
deleted file mode 100644
index 8c50dfb..0000000
--- a/src/it/it0012-jni-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef HelloWorldLib_H
-#define HelloWorldLib_H
-
-extern char* HelloWorldLib_sayHello();
-
-#endif
diff --git a/src/it/it0012-jni-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c b/src/it/it0012-jni-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
deleted file mode 100644
index 4aa35d8..0000000
--- a/src/it/it0012-jni-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include "HelloWorldLib.h"
-
-int main(int argc, char *argv[]) {
-	printf("%s\n", HelloWorldLib_sayHello());
-	return 0;
-}
-
-
diff --git a/src/it/it0012-jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/pom.xml
index 20434be..d63def0 100644
--- a/src/it/it0012-jni-dep-lib-static/pom.xml
+++ b/src/it/it0012-jni-dep-lib-static/pom.xml
@@ -29,21 +29,45 @@ under the License.
     <relativePath>../it-parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>it0012-pom</artifactId>
-  <packaging>pom</packaging>
-  
-  <name>Maven NAR JNI and Static Library</name>
+  <artifactId>it0012-jni-dep-lib-static</artifactId>
+  <packaging>nar</packaging>
+
+  <name>Maven NAR JNI</name>
   <version>1.0-SNAPSHOT</version>
   <description>
-    JNI depending on a static library.
+    JNI
   </description>
-  
-  <build>
-    <defaultGoal>install</defaultGoal>
-  </build>  
 
-  <modules>
-    <module>jni-dep-lib-static</module>
-    <module>lib-static</module>
-  </modules>
+  <build>
+    <defaultGoal>integration-test</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-nar-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <libraries>
+            <library>
+              <type>jni</type>
+              <narSystemPackage>it0012</narSystemPackage>
+              <linkCPP>false</linkCPP>
+            </library>
+          </libraries>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.nar</groupId>
+      <artifactId>it0010-lib-static</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/src/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c b/src/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c
new file mode 100644
index 0000000..e044f28
--- /dev/null
+++ b/src/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+#include "it0012_HelloWorldSharedLibJNI.h"
+
+JNIEXPORT jstring JNICALL Java_it0012_HelloWorldSharedLibJNI_sayHello( JNIEnv *env, jobject obj ) {
+	jstring value;           /* the return value */
+
+	char buf[80];            /* working buffer (really only need 20 ) */
+
+	sprintf ( buf, "%s", HelloWorldLib_sayHello());
+
+	value = (*env)->NewStringUTF( env, buf );
+
+	return value;
+}
+
diff --git a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java b/src/it/it0012-jni-dep-lib-static/src/main/java/it0012/HelloWorldSharedLibJNI.java
index 0c64a53..de48437 100644
--- a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/main/java/com/mycompany/mypackage/HelloWorldSharedLibJNI.java
+++ b/src/it/it0012-jni-dep-lib-static/src/main/java/it0012/HelloWorldSharedLibJNI.java
@@ -1,4 +1,4 @@
-package com.mycompany.mypackage;
+package it0012;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/test/java/HelloWorldSharedLibJNITest.java b/src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java
index 393212d..b3aac5c 100644
--- a/src/it/it0012-jni-dep-lib-static/jni-dep-lib-static/src/test/java/HelloWorldSharedLibJNITest.java
+++ b/src/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java
@@ -1,3 +1,4 @@
+package it0012.test;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,9 +18,10 @@
  * under the License.
  */
 
-import junit.framework.*;
+import it0012.HelloWorldSharedLibJNI;
+import junit.framework.Assert;
+import junit.framework.TestCase;
 
-import com.mycompany.mypackage.HelloWorldSharedLibJNI;
 
 public class HelloWorldSharedLibJNITest
     extends TestCase
@@ -47,6 +49,6 @@ public class HelloWorldSharedLibJNITest
     {
         HelloWorldSharedLibJNI app = new HelloWorldSharedLibJNI();
 
-        this.assertEquals( "Hello NAR LIB World!", app.sayHello() );
+        Assert.assertEquals( "Hello NAR LIB World!", app.sayHello() );
     }
 }