TEIID-1910: fix the unit test failing on CI environment

teiid · Sep 4, 2014 · fa7e439 · fa7e439
1 parent b0eef42
commit fa7e439
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/eclipselink-platform/pom.xml b/eclipselink-platform/pom.xml
@@ -16,7 +16,7 @@
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
 		</dependency>
-
+        
 		<dependency>
 			<groupId>org.jboss.teiid</groupId>
 			<artifactId>teiid-client</artifactId>
@@ -47,6 +47,13 @@
 			<classifier>lib</classifier>
 			<scope>test</scope>
 		</dependency>
+
+        <dependency>
+            <groupId>org.jboss.teiid</groupId>
+            <artifactId>teiid-common-core</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>        
 	</dependencies>
 
 </project>
diff --git a/eclipselink-platform/src/test/java/org/teiid/eclipselink/platform/TestTeiidPlatform.java b/eclipselink-platform/src/test/java/org/teiid/eclipselink/platform/TestTeiidPlatform.java
@@ -21,7 +21,8 @@
 */
 package org.teiid.eclipselink.platform;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -40,6 +41,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.teiid.core.util.UnitTestUtil;
 import org.teiid.deployers.VirtualDatabaseException;
 import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository.ConnectorManagerException;
 import org.teiid.resource.adapter.file.FileManagedConnectionFactory;
@@ -63,8 +65,7 @@ public static void init() throws VirtualDatabaseException, ConnectorManagerExcep
 		server.addTranslator("file", executionFactory);
 
 		FileManagedConnectionFactory fileManagedconnectionFactory = new FileManagedConnectionFactory();
-		String path = TestTeiidPlatform.class.getClassLoader().getResource("file").getPath() ;
-		fileManagedconnectionFactory.setParentDirectory("src/test/resources/file");
+		fileManagedconnectionFactory.setParentDirectory(UnitTestUtil.getTestDataPath()+File.separator+"file");
 		ConnectionFactory connectionFactory = fileManagedconnectionFactory.createConnectionFactory();
 		ConnectionFactoryProvider<ConnectionFactory> connectionFactoryProvider = new EmbeddedServer.SimpleConnectionFactoryProvider<ConnectionFactory>(connectionFactory);
 		server.addConnectionFactoryProvider("java:/marketdata-file", connectionFactoryProvider);
@@ -73,8 +74,7 @@ public static void init() throws VirtualDatabaseException, ConnectorManagerExcep
 		server.start(config);
 		DriverManager.registerDriver(server.getDriver());
 
-		path = TestTeiidPlatform.class.getClassLoader().getResource("vdb").getPath() + File.separator + "marketdata-vdb.xml" ;
-		server.deployVDB(new FileInputStream(new File(path)));
+		server.deployVDB(new FileInputStream(UnitTestUtil.getTestDataFile("vdb"+File.separator+"marketdata-vdb.xml")));
 
 		factory = Persistence.createEntityManagerFactory("org.teiid.eclipselink.test");
 	}