[jbosstools-commits] JBoss Tools SVN: r42438 - in trunk/maven/tests/org.jboss.tools.maven.configurators.tests: projects/jboss-sar/jboss-sar-1 and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 6 08:10:17 EDT 2012
Author: fbricon
Date: 2012-07-06 08:10:17 -0400 (Fri, 06 Jul 2012)
New Revision: 42438
Modified:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/plugin_customization.ini
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java
Log:
Fix failing tests in Maven component after the move to Juno
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath 2012-07-06 12:10:17 UTC (rev 42438)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project 2012-07-06 12:10:17 UTC (rev 42438)
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.maven.configurators.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.maven.configurators.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/plugin_customization.ini
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/plugin_customization.ini 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/plugin_customization.ini 2012-07-06 12:10:17 UTC (rev 42438)
@@ -1 +1,2 @@
-org.eclipse.m2e.core/eclipse.m2.updateIndexes=false
\ No newline at end of file
+org.eclipse.m2e.core/eclipse.m2.updateIndexes=false
+org.jboss.tools.central/showJBossCentralOnStartup=false
\ No newline at end of file
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml 2012-07-06 12:10:17 UTC (rev 42438)
@@ -14,14 +14,19 @@
<!-- Enable packaging types and lifecycle bindings. -->
<extensions>true</extensions>
<configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml 2012-07-06 12:10:17 UTC (rev 42438)
@@ -17,6 +17,11 @@
<excludeAll>true</excludeAll>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml 2012-07-06 12:10:17 UTC (rev 42438)
@@ -20,6 +20,11 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java 2012-07-06 12:10:17 UTC (rev 42438)
@@ -21,7 +21,7 @@
@Test
public void testBasicSarSupport() throws Exception {
IProject project = importProject("projects/jboss-sar/jboss-sar-1/pom.xml");
- waitForJobsToComplete(new NullProgressMonitor());
+ waitForJobsToComplete();
assertIsSarProject(project);
IVirtualComponent sarComponent = ComponentCore.createComponent(project);
@@ -32,8 +32,9 @@
assertEquals("/lib", references[0].getRuntimePath().toPortableString());
IResource[] underlyingResources = getUnderlyingResources(project);
- assertEquals(1, underlyingResources.length);
+ assertEquals(2, underlyingResources.length);
assertEquals(project.getFolder("/src/main/resources"), underlyingResources[0]);
+ assertEquals(project.getFolder("/src/main/java"), underlyingResources[1]);
}
@Test
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-07-06 09:27:29 UTC (rev 42437)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-07-06 12:10:17 UTC (rev 42438)
@@ -23,19 +23,15 @@
assertIsJpaProject(project, JpaFacet.VERSION_2_0);
assertNoErrors(project);
- JpaProjectManager manager = JptJpaCorePlugin.getJpaProjectManager(ResourcesPlugin.getWorkspace());
- JpaProject jpa = (JpaProject)project.getAdapter(JpaProject.class);
- //manager.getJpaProject(project);
- String pid = jpa.getJpaPlatform().getId();
+ String pid = JptJpaCorePlugin.getJpaPlatformId(project);
assertTrue(pid + " is not the expected platform", pid.startsWith("eclipselink") || pid.startsWith("generic"));
project = importProject( "projects/jpa/simple-1.0/pom.xml");
waitForJobsToComplete();
assertIsJpaProject(project, JpaFacet.VERSION_1_0);
assertNoErrors(project);
- jpa = (JpaProject)project.getAdapter(JpaProject.class);
- //jpa = manager.getJpaProject(project);
- pid = jpa.getJpaPlatform().getId();
+
+ pid = JptJpaCorePlugin.getJpaPlatformId(project);
assertTrue(pid + " is not the expected hibernate platform", pid.startsWith("hibernate") || pid.startsWith("generic"));
}
More information about the jbosstools-commits
mailing list