TEIID-3544, TEIID-3538: Fixed the testes based tow jiras mentioned

teiid · Jun 18, 2015 · 469443d · 469443d
1 parent 0fdc5da
commit 469443d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/test-integration/common/pom.xml b/test-integration/common/pom.xml
@@ -219,7 +219,26 @@
                                         </resource>
                                     </resources>
                                 </configuration>
-                            </execution>                                                           
+                            </execution>
+                            <execution>
+                                <id>copy-resources4</id>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/${jbossas-test-version}/standalone/deployments</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>../../odata/target/</directory>
+                                            <includes>
+                                            <include>teiid-odata-${project.version}.war</include>
+                                            </includes>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>                                                                                        
                         </executions>
                     </plugin>                    
                     <plugin>

diff --git a/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java b/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java
@@ -186,7 +186,7 @@ public void testGetDatasourceProperties() throws Exception {
 	@Test
 	public void testTraslators() throws Exception {
 		Collection<? extends Translator> translators = admin.getTranslators();
-		assertEquals(translators.toString(), 43, translators.size());  // infinispan is not configured OOTB
+		assertEquals(translators.toString(), 44, translators.size());  // infinispan is not configured OOTB
 
 		JavaArchive jar = getLoopyArchive();
 

diff --git a/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData.java b/test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData.java
@@ -27,9 +27,6 @@
 
 import java.io.StringReader;
 import java.nio.charset.Charset;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.util.Properties;
 
 import org.apache.commons.httpclient.HttpClient;
@@ -46,11 +43,11 @@
 import org.teiid.adminapi.Admin;
 import org.teiid.adminapi.AdminException;
 import org.teiid.adminapi.AdminFactory;
-import org.teiid.jdbc.TeiidDriver;
 import org.teiid.core.util.ObjectConverterUtil;
 import org.teiid.core.util.ReaderInputStream;
 import org.teiid.core.util.UnitTestUtil;
 import org.teiid.jdbc.AbstractMMQueryTestCase;
+import org.teiid.jdbc.TeiidDriver;
 
 @RunWith(Arquillian.class)
 @SuppressWarnings("nls")
@@ -97,7 +94,6 @@ public void testOdata() throws Exception {
 		assertTrue(statusCode == HttpStatus.SC_OK);
 		String stringResults = ObjectConverterUtil.convertFileToString(UnitTestUtil.getTestDataFile("loopy-metadata-results.txt"));
 		String response=method.getResponseBodyAsString();
-		System.out.println(response);
 //		if (response.indexOf("Edm.Int64") >  -1 ) {
 //		  stringResults = stringResults.replace("Edm.Int32", "Edm.Int64");    
 //		}

diff --git a/test-integration/common/src/test/resources/loopy-metadata-results.txt b/test-integration/common/src/test/resources/loopy-metadata-results.txt