diff options
author | Brian Vosburgh | 2013-08-12 16:18:57 +0000 |
---|---|---|
committer | Brian Vosburgh | 2013-08-12 16:18:57 +0000 |
commit | 72eced9bb9ab238674ac8953ac5b08c25da11854 (patch) | |
tree | 355b52e8888130e118d598a092f56a8a7e30e7b6 /jaxb | |
parent | 1f38ae8d513b17c6258ff70e8a13b45017a8f931 (diff) | |
download | webtools.dali-72eced9bb9ab238674ac8953ac5b08c25da11854.tar.gz webtools.dali-72eced9bb9ab238674ac8953ac5b08c25da11854.tar.xz webtools.dali-72eced9bb9ab238674ac8953ac5b08c25da11854.zip |
rename TestJaxbProject to JaxbProjectTestHarness
Diffstat (limited to 'jaxb')
-rw-r--r-- | jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java | 10 | ||||
-rw-r--r-- | jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java | 10 | ||||
-rw-r--r-- | jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/JaxbProjectTestHarness.java (renamed from jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java) | 16 | ||||
-rw-r--r-- | jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java | 4 | ||||
-rw-r--r-- | jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java | 18 | ||||
-rw-r--r-- | jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java | 4 |
6 files changed, 31 insertions, 31 deletions
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java index d5d9b9890c..92567f7284 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java @@ -13,7 +13,7 @@ import java.io.File; import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbCoreContextModelTests; -import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject; +import org.eclipse.jpt.jaxb.core.tests.internal.projects.JaxbProjectTestHarness; import org.eclipse.jpt.jaxb.core.tests.internal.resource.JaxbCoreResourceModelTests; import org.eclipse.jpt.jaxb.core.tests.internal.utility.JaxbCoreUtilityTests; @@ -37,18 +37,18 @@ public class JaxbCoreTests { } public static boolean jaxbJarPropertyExists() { - return getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY) != null; + return getSystemProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY) != null; } public static boolean jaxbJarFileExists() { - return (new File(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists(); + return (new File(getSystemProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists(); } public static String buildMissingJarErrorMessage() { if( ! jaxbJarPropertyExists()) { - return errorMissingProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY); + return errorMissingProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY); } - return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY)); + return errorJarFileDoesNotExist(getSystemProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY)); } /*********** private **********/ diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java index b6f2c82c44..15612560a3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jaxb.core.internal.facet.JaxbFacetInstallDataModelProvide import org.eclipse.jpt.jaxb.core.internal.libval.JaxbLibraryValidatorTools; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformManager; -import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject; +import org.eclipse.jpt.jaxb.core.tests.internal.projects.JaxbProjectTestHarness; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -44,10 +44,10 @@ public class JaxbTestCase return buildJaxbProject(BASE_PROJECT_NAME, autoBuild, buildJaxbFacetInstallConfig()); } - protected TestJaxbProject buildJaxbProject( + protected JaxbProjectTestHarness buildJaxbProject( String projectName, boolean autoBuild, IDataModel jaxbConfig) throws Exception { - return TestJaxbProject.buildJaxbProject(projectName, autoBuild, jaxbConfig); + return JaxbProjectTestHarness.buildJaxbProject(projectName, autoBuild, jaxbConfig); } protected IDataModel buildJaxbFacetInstallConfig() { @@ -78,8 +78,8 @@ public class JaxbTestCase } @Override - protected TestJaxbProject getJavaProjectTestHarness() { - return (TestJaxbProject) super.getJavaProjectTestHarness(); + protected JaxbProjectTestHarness getJavaProjectTestHarness() { + return (JaxbProjectTestHarness) super.getJavaProjectTestHarness(); } protected JaxbProject getJaxbProject() { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/JaxbProjectTestHarness.java index 65f3bfcfdd..efe0a541d6 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/JaxbProjectTestHarness.java @@ -33,7 +33,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; * controlled by building a data model and passing it into the constructor. */ @SuppressWarnings("nls") -public class TestJaxbProject +public class JaxbProjectTestHarness extends JavaProjectTestHarness { private final JaxbProject jaxbProject; @@ -59,24 +59,24 @@ public class TestJaxbProject // ********** builders ********** - public static TestJaxbProject buildJaxbProject( + public static JaxbProjectTestHarness buildJaxbProject( String baseProjectName, boolean autoBuild, IDataModel config) throws CoreException { - return new TestJaxbProject(baseProjectName, autoBuild, config); + return new JaxbProjectTestHarness(baseProjectName, autoBuild, config); } // ********** constructors/initialization ********** - public TestJaxbProject(String projectName) throws CoreException { + public JaxbProjectTestHarness(String projectName) throws CoreException { this(projectName, false); } - public TestJaxbProject(String projectName, boolean autoBuild) throws CoreException { + public JaxbProjectTestHarness(String projectName, boolean autoBuild) throws CoreException { this(projectName, autoBuild, null); } - public TestJaxbProject(String projectName, boolean autoBuild, IDataModel config) throws CoreException { + public JaxbProjectTestHarness(String projectName, boolean autoBuild, IDataModel config) throws CoreException { super(projectName, autoBuild); String jaxbFacetVersion = ((IProjectFacetVersion) config.getProperty(IFacetDataModelProperties.FACET_VERSION)).getVersionString(); @@ -110,7 +110,7 @@ public class TestJaxbProject protected class SynchronousContextModelSynchronizerCommand implements Command { public void execute() { - TestJaxbProject.this.jaxbProject.synchronizeContextModel(new NullProgressMonitor()); + JaxbProjectTestHarness.this.jaxbProject.synchronizeContextModel(new NullProgressMonitor()); } } @@ -124,7 +124,7 @@ public class TestJaxbProject protected class SynchronousUpdateSynchronizerCommand implements Command { public void execute() { - TestJaxbProject.this.jaxbProject.update(new NullProgressMonitor()); + JaxbProjectTestHarness.this.jaxbProject.update(new NullProgressMonitor()); } } diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java index 14e0efaf74..9afb48dbb0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; import org.eclipse.jpt.common.core.tests.internal.resource.java.JavaResourceModelTestCase; import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_PlatformDefinition; -import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject; +import org.eclipse.jpt.jaxb.core.tests.internal.projects.JaxbProjectTestHarness; public class JaxbJavaResourceModelTestCase extends JavaResourceModelTestCase { @@ -26,7 +26,7 @@ public class JaxbJavaResourceModelTestCase @Override protected void setUp() throws Exception { super.setUp(); - this.javaProjectTestHarness.addJar(TestJaxbProject.jaxbJarName()); + this.javaProjectTestHarness.addJar(JaxbProjectTestHarness.jaxbJarName()); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java index 53a4d45c83..f9e2eba4c2 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal; import java.io.File; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject; +import org.eclipse.jpt.jaxb.core.tests.internal.projects.JaxbProjectTestHarness; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbCoreContextModelTests; import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.ELJaxbCoreResourceModelTests; @@ -38,32 +38,32 @@ public class ELJaxbCoreTests { } public static boolean jaxbJarPropertyExists() { - return getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY) != null; + return getSystemProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY) != null; } public static boolean jaxbJarFileExists() { - return (new File(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists(); + return (new File(getSystemProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists(); } public static boolean eclipselinkJarPropertyExists() { - return getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY) != null; + return getSystemProperty(JaxbProjectTestHarness.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY) != null; } public static boolean eclipselinkJarFileExists() { - return (new File(getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY))).exists(); + return (new File(getSystemProperty(JaxbProjectTestHarness.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY))).exists(); } public static String buildMissingJarErrorMessage() { if( ! jaxbJarPropertyExists()) { - return errorMissingProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY); + return errorMissingProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY); } else if( ! jaxbJarFileExists()) { - return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY)); + return errorJarFileDoesNotExist(getSystemProperty(JaxbProjectTestHarness.JAXB_JAR_NAME_SYSTEM_PROPERTY)); } else if( ! eclipselinkJarPropertyExists()) { - return errorMissingProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY); + return errorMissingProperty(JaxbProjectTestHarness.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY); } - return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY)); + return errorJarFileDoesNotExist(getSystemProperty(JaxbProjectTestHarness.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY)); } /*********** private **********/ diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java index 8baedd1f9c..f9f211ceb0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; import org.eclipse.jpt.common.core.tests.internal.resource.java.JavaResourceModelTestCase; -import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject; +import org.eclipse.jpt.jaxb.core.tests.internal.projects.JaxbProjectTestHarness; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1.ELJaxb_2_1_PlatformDefinition; @@ -27,7 +27,7 @@ public class ELJaxbJavaResourceModelTestCase @Override protected void setUp() throws Exception { super.setUp(); - this.javaProjectTestHarness.addJar(TestJaxbProject.eclipseLinkJarName()); + this.javaProjectTestHarness.addJar(JaxbProjectTestHarness.eclipseLinkJarName()); } @Override |