Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2008-09-23 23:25:54 -0400
committerkmoore2008-09-23 23:25:54 -0400
commit3a86aa898ad95e4e77dd94936271200cb173b7cb (patch)
treebd6a14639d57742376a699ebc00cdf3a18c9e582
parent463067d8c1f4728ad4e44e33b78aa39624e40ec5 (diff)
downloadwebtools.dali-3a86aa898ad95e4e77dd94936271200cb173b7cb.tar.gz
webtools.dali-3a86aa898ad95e4e77dd94936271200cb173b7cb.tar.xz
webtools.dali-3a86aa898ad95e4e77dd94936271200cb173b7cb.zip
adding the java context model tests back to the build
-rw-r--r--jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java4
-rw-r--r--jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JptCoreContextJavaModelTests.java60
2 files changed, 30 insertions, 34 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java
index a8d78e4627..bda4fc063b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/JptCoreTests.java
@@ -42,9 +42,7 @@ public class JptCoreTests {
suite.addTest(JptCoreUtilityJdtTests.suite(all));
suite.addTest(JptCoreModelTests.suite(all));
suite.addTest(JptCoreResourceModelTests.suite(all));
-// if (all) {
- suite.addTest(JptCoreContextModelTests.suite(all));
-// }
+ suite.addTest(JptCoreContextModelTests.suite(all));
}
else {
String message = ( ! jpaJarPropertyExists()) ?
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JptCoreContextJavaModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JptCoreContextJavaModelTests.java
index 60785b581b..26e0df5cc6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JptCoreContextJavaModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JptCoreContextJavaModelTests.java
@@ -22,37 +22,35 @@ public class JptCoreContextJavaModelTests extends TestCase
public static Test suite(boolean all) {
TestSuite suite = new TestSuite(JptCoreContextJavaModelTests.class.getName());
- if (all) {
- suite.addTestSuite(JavaAssociationOverrideTests.class);
- suite.addTestSuite(JavaAttributeOverrideTests.class);
- suite.addTestSuite(JavaBasicMappingTests.class);
- suite.addTestSuite(JavaColumnTests.class);
- suite.addTestSuite(JavaDiscriminatorColumnTests.class);
- suite.addTestSuite(JavaEmbeddableTests.class);
- suite.addTestSuite(JavaEmbeddedIdMappingTests.class);
- suite.addTestSuite(JavaEmbeddedMappingTests.class);
- suite.addTestSuite(JavaEntityTests.class);
- suite.addTestSuite(JavaGeneratedValueTests.class);
- suite.addTestSuite(JavaIdMappingTests.class);
- suite.addTestSuite(JavaJoinColumnTests.class);
- suite.addTestSuite(JavaJoinTableTests.class);
- suite.addTestSuite(JavaMappedSuperclassTests.class);
- suite.addTestSuite(JavaManyToManyMappingTests.class);
- suite.addTestSuite(JavaManyToOneMappingTests.class);
- suite.addTestSuite(JavaNamedQueryTests.class);
- suite.addTestSuite(JavaNamedNativeQueryTests.class);
- suite.addTestSuite(JavaQueryHintTests.class);
- suite.addTestSuite(JavaOneToManyMappingTests.class);
- suite.addTestSuite(JavaOneToOneMappingTests.class);
- suite.addTestSuite(JavaPersistentTypeTests.class);
- suite.addTestSuite(JavaPersistentAttributeTests.class);
- suite.addTestSuite(JavaPrimaryKeyJoinColumnTests.class);
- suite.addTestSuite(JavaSecondaryTableTests.class);
- suite.addTestSuite(JavaSequenceGeneratorTests.class);
- suite.addTestSuite(JavaTableGeneratorTests.class);
- suite.addTestSuite(JavaTableTests.class);
- suite.addTestSuite(JavaTransientMappingTests.class);
- }
+ suite.addTestSuite(JavaAssociationOverrideTests.class);
+ suite.addTestSuite(JavaAttributeOverrideTests.class);
+ suite.addTestSuite(JavaBasicMappingTests.class);
+ suite.addTestSuite(JavaColumnTests.class);
+ suite.addTestSuite(JavaDiscriminatorColumnTests.class);
+ suite.addTestSuite(JavaEmbeddableTests.class);
+ suite.addTestSuite(JavaEmbeddedIdMappingTests.class);
+ suite.addTestSuite(JavaEmbeddedMappingTests.class);
+ suite.addTestSuite(JavaEntityTests.class);
+ suite.addTestSuite(JavaGeneratedValueTests.class);
+ suite.addTestSuite(JavaIdMappingTests.class);
+ suite.addTestSuite(JavaJoinColumnTests.class);
+ suite.addTestSuite(JavaJoinTableTests.class);
+ suite.addTestSuite(JavaMappedSuperclassTests.class);
+ suite.addTestSuite(JavaManyToManyMappingTests.class);
+ suite.addTestSuite(JavaManyToOneMappingTests.class);
+ suite.addTestSuite(JavaNamedQueryTests.class);
+ suite.addTestSuite(JavaNamedNativeQueryTests.class);
+ suite.addTestSuite(JavaQueryHintTests.class);
+ suite.addTestSuite(JavaOneToManyMappingTests.class);
+ suite.addTestSuite(JavaOneToOneMappingTests.class);
+ suite.addTestSuite(JavaPersistentTypeTests.class);
+ suite.addTestSuite(JavaPersistentAttributeTests.class);
+ suite.addTestSuite(JavaPrimaryKeyJoinColumnTests.class);
+ suite.addTestSuite(JavaSecondaryTableTests.class);
+ suite.addTestSuite(JavaSequenceGeneratorTests.class);
+ suite.addTestSuite(JavaTableGeneratorTests.class);
+ suite.addTestSuite(JavaTableTests.class);
+ suite.addTestSuite(JavaTransientMappingTests.class);
suite.addTestSuite(JavaVersionMappingTests.class);
return suite;
}

Back to the top