completed framework for automated testing of external libraries
diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index 9122336..256a9db 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -88,23 +88,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <includes>
- <include>**/*.class</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -193,6 +176,13 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>edu.uci.ics.asterix</groupId>
+ <artifactId>asterix-common</artifactId>
+ <version>0.0.5-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.kenai.nbpwr</groupId>
<artifactId>org-apache-commons-io</artifactId>
diff --git a/asterix-aql/pom.xml b/asterix-aql/pom.xml
index bb6f4b5..516d679 100644
--- a/asterix-aql/pom.xml
+++ b/asterix-aql/pom.xml
@@ -82,6 +82,12 @@
</build>
<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>edu.uci.ics.asterix</groupId>
<artifactId>asterix-common</artifactId>
diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml
index bb2b97f..3987158 100644
--- a/asterix-common/pom.xml
+++ b/asterix-common/pom.xml
@@ -18,6 +18,23 @@
<fork>true</fork>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -37,6 +54,12 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>hyracks-storage-am-lsm-common</artifactId>
diff --git a/asterix-common/src/test/java/edu/uci/ics/asterix/test/aql/TestHelper.java b/asterix-common/src/test/java/edu/uci/ics/asterix/test/aql/TestHelper.java
new file mode 100644
index 0000000..5777d0a
--- /dev/null
+++ b/asterix-common/src/test/java/edu/uci/ics/asterix/test/aql/TestHelper.java
@@ -0,0 +1,16 @@
+package edu.uci.ics.asterix.test.aql;
+
+import java.util.List;
+
+public final class TestHelper {
+
+ public static boolean isInPrefixList(List<String> prefixList, String s) {
+ for (String s2 : prefixList) {
+ if (s.startsWith(s2)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java b/asterix-common/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
similarity index 100%
rename from asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
rename to asterix-common/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
diff --git a/asterix-external-data/src/main/java/edu/uci/ics/asterix/external/library/ExternalFunction.java b/asterix-external-data/src/main/java/edu/uci/ics/asterix/external/library/ExternalFunction.java
index 0b31268..aaa5403 100755
--- a/asterix-external-data/src/main/java/edu/uci/ics/asterix/external/library/ExternalFunction.java
+++ b/asterix-external-data/src/main/java/edu/uci/ics/asterix/external/library/ExternalFunction.java
@@ -40,7 +40,7 @@
String functionLibary = fnameComponents[0];
String dataverse = finfo.getFunctionIdentifier().getNamespace();
ClassLoader libraryClassLoader = ExternalLibraryManager.getLibraryClassLoader(dataverse, functionLibary);
- String classname = finfo.getFunctionBody();
+ String classname = finfo.getFunctionBody().trim();
Class clazz;
try {
clazz = Class.forName(classname, true, libraryClassLoader);
diff --git a/asterix-external-data/src/test/java/edu/uci/ics/asterix/external/library/SumFactory.java b/asterix-external-data/src/test/java/edu/uci/ics/asterix/external/library/SumFactory.java
index a49da61..eabc6b5 100644
--- a/asterix-external-data/src/test/java/edu/uci/ics/asterix/external/library/SumFactory.java
+++ b/asterix-external-data/src/test/java/edu/uci/ics/asterix/external/library/SumFactory.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
package edu.uci.ics.asterix.external.library;
-
+
import edu.uci.ics.asterix.external.library.IExternalScalarFunction;
import edu.uci.ics.asterix.external.library.IFunctionFactory;
diff --git a/asterix-installer/pom.xml b/asterix-installer/pom.xml
index 028c408..6da49a3 100644
--- a/asterix-installer/pom.xml
+++ b/asterix-installer/pom.xml
@@ -156,7 +156,7 @@
</dependency>
<dependency>
<groupId>edu.uci.ics.asterix</groupId>
- <artifactId>asterix-app</artifactId>
+ <artifactId>asterix-common</artifactId>
<version>0.0.5-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>