added all the resource model tests to the build, trying to see if these pass on the build now

4 files changed, 9 insertions, 13 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
index ccc705abd2..e77d42f62c 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2007 Oracle. 
+ *  Copyright (c) 2007, 2008 Oracle. 
  *  All rights reserved.  This program and the accompanying materials 
  *  are made available under the terms of the Eclipse Public License v1.0 
  *  which accompanies this distribution, and is available at 
@@ -24,10 +24,8 @@ public class JptCoreResourceModelTests extends TestCase
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptCoreResourceModelTests.class.getName());
 		suite.addTest(JptJavaResourceTests.suite(all));
-		if (all) {
-			suite.addTestSuite(OrmModelTests.class);
-			suite.addTestSuite(PersistenceModelTests.class);
-		}
+		suite.addTestSuite(OrmModelTests.class);
+		suite.addTestSuite(PersistenceModelTests.class);
 		return suite;
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java
index 1d71a9ecd8..77749ed809 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java
@@ -50,7 +50,7 @@ public class OrmModelTests extends TestCase
 		OrmResourceModelProvider modelProvider = 
 			OrmResourceModelProvider.getDefaultModelProvider(jpaProject.getProject());
 		assertNotNull(modelProvider);
-		OrmResource resource = (OrmResource) modelProvider.getResource();
+		OrmResource resource = modelProvider.getResource();
 		assertNotNull(resource);
 	}
 	
@@ -58,7 +58,7 @@ public class OrmModelTests extends TestCase
 		OrmResourceModelProvider modelProvider = 
 			OrmResourceModelProvider.getDefaultModelProvider(jpaProject.getProject());
 		assertNotNull(modelProvider);
-		OrmResource resource = (OrmResource) modelProvider.getResource();
+		OrmResource resource = modelProvider.getResource();
 		assertNotNull(resource);
 	}
 	
@@ -66,7 +66,7 @@ public class OrmModelTests extends TestCase
 		OrmResourceModelProvider modelProvider = 
 			OrmResourceModelProvider.getModelProvider(jpaProject.getProject(), "META-INF/orm2.xml");
 		assertNotNull(modelProvider);
-		OrmResource resource = (OrmResource) modelProvider.getResource();
+		OrmResource resource = modelProvider.getResource();
 		assertNotNull(resource);
 	}
 	
@@ -75,7 +75,7 @@ public class OrmModelTests extends TestCase
 		OrmResourceModelProvider modelProvider = 
 			OrmResourceModelProvider.getDefaultModelProvider(jpaProject.getProject());
 		assertNotNull(modelProvider);
-		OrmResource resource = (OrmResource) modelProvider.getResource();
+		OrmResource resource = modelProvider.getResource();
 		assertNotNull(resource);
 		assertTrue(resource.exists());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java
index 962fdcc4c7..66048a683b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java
@@ -70,7 +70,7 @@ public class PersistenceModelTests extends TestCase
 		PersistenceResourceModelProvider modelProvider = 
 			PersistenceResourceModelProvider.getDefaultModelProvider(jpaProject.getProject());
 		assertNotNull(modelProvider);
-		PersistenceResource resource = (PersistenceResource) modelProvider.getResource();
+		PersistenceResource resource = modelProvider.getResource();
 		assertNotNull(resource);
 		assertTrue(resource.exists());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JptJavaResourceTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JptJavaResourceTests.java
index 781a0606dd..0d3e0f3b56 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JptJavaResourceTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JptJavaResourceTests.java
@@ -20,9 +20,7 @@ public class JptJavaResourceTests {
 	
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptJavaResourceTests.class.getName());
-		if (all) {
-			suite.addTestSuite(JpaCompilationUnitTests.class);
-		}
+		suite.addTestSuite(JpaCompilationUnitTests.class);
 		suite.addTestSuite(JavaResourcePersistentTypeTests.class);
 		suite.addTestSuite(JavaResourcePersistentAttributeTests.class);
 		suite.addTestSuite(JPTToolsTests.class);