[jbosstools-commits] JBoss Tools SVN: r23158 - in trunk/cdi: features and 13 other directories.

Author: dgolovin Date: 2010-07-01 15:43:38 -0400 (Thu, 01 Jul 2010) New Revision: 23158 Removed: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml trunk/cdi/features/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml trunk/cdi/plugins/pom.xml trunk/cdi/pom.xml trunk/cdi/site/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml trunk/cdi/tests/pom.xml Log: 1. maven repo structure adjusted to svn repo 2. problem related to test being executed twice for hiperlink detection is fixed 3. coverage support enabled Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml =================================================================== --- trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.features</groupId> <artifactId>org.jboss.tools.cdi.feature</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/cdi/features/pom.xml =================================================================== --- trunk/cdi/features/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/features/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -1,18 +1,13 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>cdi.features</artifactId> + <groupId>org.jboss.tools.cdi</groupId> + <artifactId>features</artifactId> + <name>cdi.features</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.cdi.feature</module> </modules> </project> - \ No newline at end of file + Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.plugins</groupId> <artifactId>org.jboss.tools.cdi.core</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.plugins</groupId> <artifactId>org.jboss.tools.cdi.text.ext</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.plugins</groupId> <artifactId>org.jboss.tools.cdi.ui</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.plugins</groupId> <artifactId>org.jboss.tools.cdi.xml</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.plugins</groupId> <artifactId>org.jboss.tools.cdi.xml.ui</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/cdi/plugins/pom.xml =================================================================== --- trunk/cdi/plugins/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/plugins/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>cdi.plugins</artifactId> + <groupId>org.jboss.tools.cdi</groupId> + <artifactId>plugins</artifactId> + <name>cdi.plugins</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -19,4 +14,4 @@ <module>org.jboss.tools.cdi.xml.ui</module> </modules> </project> - \ No newline at end of file + Modified: trunk/cdi/pom.xml =================================================================== --- trunk/cdi/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> <groupId>org.jboss.tools</groupId> - <artifactId>cdi.all</artifactId> + <artifactId>cdi</artifactId> + <name>cdi.all</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/cdi/site/pom.xml =================================================================== --- trunk/cdi/site/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/site/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -6,8 +6,9 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>cdi.site</artifactId> + <groupId>org.jboss.tools.cdi</groupId> + <artifactId>site</artifactId> + <name>cdi.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> </project> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,10 +7,16 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.tests</groupId> <artifactId>org.jboss.tools.cdi.core.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <emma.filter>org.jboss.tools.cdi.core*,org.jboss.tools.cdi.internal.core*</emma.filter> + <emma.instrument.bundles>org.jboss.tools.cdi.core</emma.instrument.bundles> + </properties> + <build> <plugins> <plugin> Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,10 +7,16 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.tests</groupId> <artifactId>org.jboss.tools.cdi.text.ext.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <emma.filter>org.jboss.tools.cdi*</emma.filter> + <emma.instrument.bundles>org.jboss.tools.cdi.core,org.jboss.tools.cdi.text.ext</emma.instrument.bundles> + </properties> + <build> <plugins> <plugin> Deleted: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java 2010-07-01 19:43:38 UTC (rev 23158) @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.text.ext.test; - -import junit.framework.Test; -import junit.framework.TestSuite; - - -public class CDITextExtTestSuite extends TestSuite { - - public static Test suite() { - TestSuite suite = new TestSuite("CDI Text Ext Tests"); - suite.addTest(InjectedPointHyperlinkDetectorTest.suite()); - return suite; - } -} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-07-01 19:43:38 UTC (rev 23158) @@ -13,7 +13,7 @@ JavaModelManager.getIndexManager().disable(); TestSuite suite = new TestSuite(CdiTextExtAllTests.class.getName()); - suite.addTest(new CDICoreTestSetup(CDITextExtTestSuite.suite())); + suite.addTest(new CDICoreTestSetup(new TestSuite(InjectedPointHyperlinkDetectorTest.class))); return suite; } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2010-07-01 19:43:38 UTC (rev 23158) @@ -6,6 +6,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jdt.internal.ui.text.JavaWordFinder; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; @@ -55,7 +56,7 @@ } IDocument document = documentProvider.getDocument(editorInput); - + assertNotNull("The document for the file \"" + fileName + "\" is not loaded", document); int expected = 0; @@ -84,8 +85,10 @@ } } else { for(Region region : regionList){ - if(i >= region.getOffset() && i <= region.getOffset()+region.getLength()) + if(i >= region.getOffset() && i <= region.getOffset()+region.getLength()) { + int line = document.getLineOfOffset(region.getOffset()); fail("Wrong detection for region - "+region.getOffset()+" : "+region.getLength()+" region - "+i); + } } } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-07-01 19:43:38 UTC (rev 23158) @@ -12,10 +12,6 @@ public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorTest { - public static Test suite() { - return new TestSuite(InjectedPointHyperlinkDetectorTest.class); - } - public void testInjectedPointHyperlinkDetector() throws Exception { ArrayList<Region> regionList = new ArrayList<Region>(); regionList.add(new Region(115, 6)); // Inject Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -7,10 +7,16 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.cdi.tests</groupId> <artifactId>org.jboss.tools.cdi.ui.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <emma.filter>org.jboss.tools.cdi*</emma.filter> + <emma.instrument.bundles>org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui</emma.instrument.bundles> + </properties> + <build> <plugins> <plugin> Modified: trunk/cdi/tests/pom.xml =================================================================== --- trunk/cdi/tests/pom.xml 2010-07-01 18:09:43 UTC (rev 23157) +++ trunk/cdi/tests/pom.xml 2010-07-01 19:43:38 UTC (rev 23158) @@ -1,14 +1,9 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>cdi.tests</artifactId> + <groupId>org.jboss.tools.cdi</groupId> + <artifactId>tests</artifactId> + <name>cdi.tests</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -17,4 +12,4 @@ <module>org.jboss.tools.cdi.ui.test</module> </modules> </project> - \ No newline at end of file +