JBoss Tools SVN: r23071 - in trunk/maven/plugins/org.jboss.tools.maven.seam: src/org/jboss/tools/maven/seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-06-28 16:32:09 -0400 (Mon, 28 Jun 2010)
New Revision: 23071
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
https://jira.jboss.org/browse/JBIDE-6452 New Seam Web Project with Maven support - problems with test project
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-06-28 20:20:44 UTC (rev 23070)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-06-28 20:32:09 UTC (rev 23071)
@@ -511,7 +511,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
+ <configuration>
+ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true</argLine>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-06-28 20:20:44 UTC (rev 23070)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-06-28 20:32:09 UTC (rev 23071)
@@ -13,9 +13,12 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
+import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
@@ -34,7 +37,10 @@
import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -131,6 +137,8 @@
private String testProjectName;
private String testArtifactId;
+ private String groupId;
+
/**
* The constructor
*/
@@ -171,6 +179,7 @@
Assert.isNotNull(m2FacetModel);
webProjectName = seamFacetModel.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
artifactId = m2FacetModel.getStringProperty(IJBossMavenConstants.ARTIFACT_ID);
+ groupId = m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID);
parentProjectName = webProjectName + PARENT_SUFFIX;
parentArtifactId = artifactId + PARENT_SUFFIX;
testProjectName = webProjectName + TEST_SUFFIX;
@@ -235,7 +244,7 @@
dependencies.add(dependency);
dependency = getSeamDependency();
- dependency.setScope("test"); //$NON-NLS-1$
+ dependency.setScope("compile"); //$NON-NLS-1$
dependencies.add(dependency);
dependency = getJSFApi();
@@ -253,7 +262,7 @@
// FIXME
dependency.setVersion("${testng.version}"); //$NON-NLS-1$
dependency.setClassifier("jdk15"); //$NON-NLS-1$
- dependency.setScope("test"); //$NON-NLS-1$
+ dependency.setScope("compile"); //$NON-NLS-1$
dependencies.add(dependency);
dependency = new Dependency();
@@ -267,6 +276,30 @@
dependencies.add(dependency);
dependency = new Dependency();
+ dependency.setGroupId("javax.el"); //$NON-NLS-1$
+ dependency.setArtifactId("el-api"); //$NON-NLS-1$
+ dependency.setScope("test"); //$NON-NLS-1$
+ dependencies.add(dependency);
+
+ dependency = new Dependency();
+ dependency.setGroupId(groupId);
+ dependency.setArtifactId(artifactId);
+ dependency.setType("war"); //$NON-NLS-1$
+ dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION));
+ dependency.setScope("test"); //$NON-NLS-1$
+ dependencies.add(dependency);
+
+ if (!SeamFacetAbstractInstallDelegate
+ .isWarConfiguration(seamFacetModel)) {
+ dependency = new Dependency();
+ dependency.setGroupId(groupId);
+ dependency.setArtifactId(ejbArtifactId);
+ dependency.setType("ejb"); //$NON-NLS-1$
+ dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION));
+ dependency.setScope("test"); //$NON-NLS-1$
+ dependencies.add(dependency);
+ }
+ dependency = new Dependency();
dependency.setGroupId("org.drools"); //$NON-NLS-1$
dependency.setArtifactId("drools-compiler"); //$NON-NLS-1$
dependency.setScope("test"); //$NON-NLS-1$
@@ -291,10 +324,35 @@
String sourceDirectory = MavenCoreActivator.getSourceDirectory(javaProject);
if (sourceDirectory != null) {
build.setSourceDirectory(sourceDirectory);
+ build.setTestSourceDirectory(sourceDirectory);
}
String outputDirectory = MavenCoreActivator.getOutputDirectory(javaProject);
build.setOutputDirectory(outputDirectory);
+ build.setTestOutputDirectory(outputDirectory);
MavenCoreActivator.addResource(build, project, sourceDirectory);
+ Resource resource = new Resource();
+
+ resource.setDirectory(MavenCoreActivator.BASEDIR + "/bootstrap"); //$NON-NLS-1$
+ List<String> excludes = new ArrayList<String>();
+ excludes.add("**/*.java"); //$NON-NLS-1$
+ resource.setExcludes(excludes);
+ build.getResources().add(resource);
+
+ resource = new Resource();
+ IProject webProject = ResourcesPlugin.getWorkspace().getRoot().getProject(webProjectName);
+ if (project == null || !project.exists()) {
+ return;
+ }
+ IVirtualComponent component = ComponentCore.createComponent(webProject);
+ IVirtualFolder rootFolder = component.getRootFolder();
+ IContainer root = rootFolder.getUnderlyingFolder();
+ String webContent = root.getProjectRelativePath().toString();
+ resource.setDirectory(MavenCoreActivator.BASEDIR + "/../" + webProjectName + "/" + webContent); //$NON-NLS-1$ //$NON-NLS-2$
+ excludes = new ArrayList<String>();
+ excludes.add("**/*.java"); //$NON-NLS-1$
+ resource.setExcludes(excludes);
+ build.getResources().add(resource);
+
model.setBuild(build);
MavenCoreActivator.createMavenProject(testProjectName, null, model, true);
} catch (Exception e) {
15 years, 9 months
JBoss Tools SVN: r23070 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-28 16:20:44 -0400 (Mon, 28 Jun 2010)
New Revision: 23070
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-28 19:58:45 UTC (rev 23069)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-28 20:20:44 UTC (rev 23070)
@@ -31,7 +31,6 @@
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -55,6 +54,7 @@
import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
+import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
@@ -347,6 +347,14 @@
}
if (bean instanceof IClassBean) {
+ Set<IInterceptorBindingDeclaration> bindingDeclarations = ((IClassBean) bean).getInterceptorBindings();
+ for (IInterceptorBindingDeclaration bindingDeclaration : bindingDeclarations) {
+ IInterceptorBinding binding = bindingDeclaration.getInterceptorBinding();
+ if (!binding.getSourceType().isReadOnly()) {
+ validationContext.addLinkedCoreResource(beanPath, binding.getResource().getFullPath(), false);
+ }
+ }
+
validateClassBean((IClassBean) bean);
}
15 years, 9 months
JBoss Tools SVN: r23069 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-28 15:58:45 -0400 (Mon, 28 Jun 2010)
New Revision: 23069
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorStereotype.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/NoInterceptorBinfdingsInInterceptor.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Added new validation rule: - interceptor declared using @Interceptor does not declare any interceptor binding (Non-Portable behavior)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-06-28 19:55:57 UTC (rev 23068)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-06-28 19:58:45 UTC (rev 23069)
@@ -191,7 +191,13 @@
*/
IStereotype getStereotype(IPath path);
+ /**
+ * Returns all the available intercepter binding types.
+ *
+ * @return all the available intercepter binding types
+ */
IInterceptorBinding[] getInterceptorBindings();
+
/**
* Returns interceptor binding model element for fully qualified name of
* interceptor binding annotation type
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-28 19:55:57 UTC (rev 23068)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-28 19:58:45 UTC (rev 23069)
@@ -55,6 +55,7 @@
import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
+import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
@@ -1240,6 +1241,17 @@
for (IProducer producer : producers) {
addError(CDIValidationMessages.PRODUCER_IN_INTERCEPTOR, CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, producer.getProducesAnnotation(), interceptor.getResource());
}
+ /*
+ * 9.2. Declaring the interceptor bindings of an interceptor
+ * - interceptor declared using @Interceptor does not declare any interceptor binding (Non-Portable behavior)
+ */
+ Set<IInterceptorBindingDeclaration> bindings = interceptor.getInterceptorBindings();
+ if(bindings.isEmpty()) {
+ ITextSourceReference declaration = interceptor.getAnnotation(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME);
+ if(declaration!=null) {
+ addError(CDIValidationMessages.MISSING_INTERCEPTOR_BINDING, CDIPreferences.MISSING_INTERCEPTOR_BINDING, declaration, interceptor.getResource());
+ }
+ }
}
private void validateDecorator(IDecorator decorator) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-06-28 19:55:57 UTC (rev 23068)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-06-28 19:58:45 UTC (rev 23069)
@@ -75,7 +75,7 @@
OBSERVER_IN_INTERCEPTOR_OR_DECORATOR=Interceptor or decorator has a method with a parameter annotated @Observes
INTERCEPTOR_IS_ALTERNATIVE=Interceptor is an alternative
DECORATOR_IS_ALTERNATIVE=Decorator is an alternative
-MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor does not declare any interceptor binding
+MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor should specify at least one interceptor binding [JSR-299 �9.2]
INJECTED_DECORATOR=Injection point resolves to a decorator
INJECTED_INTERCEPTOR=Injection point resolves to an interceptor
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-06-28 19:55:57 UTC (rev 23068)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-06-28 19:58:45 UTC (rev 23069)
@@ -117,7 +117,7 @@
// {CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label},
// {CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label},
{CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label},
-// {CDIPreferences.MISSING_INTERCEPTOR_BINDING, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label},
+ {CDIPreferences.MISSING_INTERCEPTOR_BINDING, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label},
{CDIPreferences.INJECTED_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_injectedDecorator_label},
{CDIPreferences.INJECTED_INTERCEPTOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_injectedInterceptor_label},
},
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorStereotype.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorStereotype.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorStereotype.java 2010-06-28 19:58:45 UTC (rev 23069)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.interceptors;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Stereotype;
+
+@Stereotype
+@CatInterceptorBinding
+@Target({ TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface InterceptorStereotype {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/NoInterceptorBinfdingsInInterceptor.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/NoInterceptorBinfdingsInInterceptor.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/NoInterceptorBinfdingsInInterceptor.java 2010-06-28 19:58:45 UTC (rev 23069)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+public class NoInterceptorBinfdingsInInterceptor {
+
+ @AroundInvoke
+ public Object intercept(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/NoInterceptorBinfdingsInInterceptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/beans.xml 2010-06-28 19:55:57 UTC (rev 23068)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/beans.xml 2010-06-28 19:58:45 UTC (rev 23069)
@@ -5,5 +5,6 @@
<class>org.jboss.jsr299.tck.tests.jdt.validation.interceptors.InterceptorWithWrongScopeBroken</class>
<class>org.jboss.jsr299.tck.tests.jdt.validation.interceptors.AlternativeInterceptorBroken</class>
<class>org.jboss.jsr299.tck.tests.jdt.validation.interceptors.CatInterceptor</class>
+ <class>org.jboss.jsr299.tck.tests.jdt.validation.interceptors.NoInterceptorBinfdingsInInterceptor</class>
</interceptors>
</beans>
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-06-28 19:55:57 UTC (rev 23068)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-06-28 19:58:45 UTC (rev 23069)
@@ -1156,6 +1156,20 @@
}
/**
+ * 9.2. Declaring the interceptor bindings of an interceptor
+ * - interceptor declared using @Interceptor does not declare any interceptor binding (Non-Portable behavior)
+ *
+ * @throws Exception
+ */
+ public void testNoInterceptorBinfdingsInInterceptor() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/NoInterceptorBinfdingsInInterceptor.java");
+ assertMarkerIsCreated(file, CDIValidationMessages.MISSING_INTERCEPTOR_BINDING, 7);
+
+ file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/interceptors/definition/SecureTransaction.java");
+ assertMarkerIsNotCreated(file, CDIValidationMessages.MISSING_INTERCEPTOR_BINDING);
+ }
+
+ /**
* 10.4.2. Declaring an observer method
* - method has more than one parameter annotated @Observes
*
15 years, 9 months
JBoss Tools SVN: r23068 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-28 15:55:57 -0400 (Mon, 28 Jun 2010)
New Revision: 23068
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6550
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-06-28 18:59:14 UTC (rev 23067)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-06-28 19:55:57 UTC (rev 23068)
@@ -14,7 +14,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IInterceptor;
+import org.jboss.tools.cdi.core.IClassBean;
/**
* @author Alexey Kazakov
@@ -30,8 +30,8 @@
Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.SecureTransaction");
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
- assertTrue("The bean should be an interceptor", bean instanceof IInterceptor);
- IInterceptor interceptor = (IInterceptor)bean;
+ assertTrue("The bean should be an interceptor", bean instanceof IClassBean);
+ IClassBean interceptor = (IClassBean)bean;
assertFalse("The intercpetor should inherites interceptor bindings", interceptor.getInterceptorBindings().isEmpty());
}
}
\ No newline at end of file
15 years, 9 months
JBoss Tools SVN: r23067 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-28 14:59:14 -0400 (Mon, 28 Jun 2010)
New Revision: 23067
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6550
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-06-28 18:33:41 UTC (rev 23066)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-06-28 18:59:14 UTC (rev 23067)
@@ -26,8 +26,8 @@
* b) An interceptor binding declared by a stereotype are inherited by any bean that declares that stereotype.
* @throws JavaModelException
*/
- public void testBeanTypesNonEmpty() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.FileLogger");
+ public void testStereotypeInterceptorBindings() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.SecureTransaction");
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue("The bean should be an interceptor", bean instanceof IInterceptor);
15 years, 9 months
JBoss Tools SVN: r23066 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-28 14:33:41 -0400 (Mon, 28 Jun 2010)
New Revision: 23066
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6550 Added a unit test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-06-28 18:07:09 UTC (rev 23065)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-06-28 18:33:41 UTC (rev 23066)
@@ -24,6 +24,7 @@
import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.EnterpriseStereotypeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.InjectionPointTest;
+import org.jboss.tools.cdi.core.test.tck.InterceptorDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
@@ -62,6 +63,7 @@
suite.addTestSuite(AssignabilityOfRawAndParameterizedTypesTest.class);
suite.addTestSuite(QualifierWithMembersTest.class);
suite.addTestSuite(DynamicLookupTest.class);
+ suite.addTestSuite(InterceptorDefinitionTest.class);
suite.addTestSuite(ValidationTest.class);
return new CDICoreTestSetup(suite);
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-06-28 18:33:41 UTC (rev 23066)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInterceptor;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class InterceptorDefinitionTest extends TCKTest {
+
+ /**
+ * Section 9.1.2 - Interceptor bindings for stereotypes
+ * b) An interceptor binding declared by a stereotype are inherited by any bean that declares that stereotype.
+ * @throws JavaModelException
+ */
+ public void testBeanTypesNonEmpty() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.FileLogger");
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertTrue("The bean should be an interceptor", bean instanceof IInterceptor);
+ IInterceptor interceptor = (IInterceptor)bean;
+ assertFalse("The intercpetor should inherites interceptor bindings", interceptor.getInterceptorBindings().isEmpty());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
JBoss Tools SVN: r23065 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-28 14:07:09 -0400 (Mon, 28 Jun 2010)
New Revision: 23065
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
Log:
Added exception logging.
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2010-06-28 16:44:09 UTC (rev 23064)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2010-06-28 18:07:09 UTC (rev 23065)
@@ -11,9 +11,7 @@
package org.jboss.tools.seam.text.ext.hyperlink;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -21,12 +19,9 @@
import org.eclipse.jdt.core.IAnnotatable;
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.ICodeAssist;
-import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
@@ -37,22 +32,16 @@
import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.ui.texteditor.ITextEditor;
-import org.jboss.tools.common.text.ext.hyperlink.HyperlinkBuilder;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.IRole;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
import org.jboss.tools.seam.core.ISeamContextShortVariable;
import org.jboss.tools.seam.core.ISeamContextVariable;
-import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.scanner.ScannerException;
-import org.jboss.tools.seam.internal.core.scanner.java.AnnotatedASTNode;
-import org.jboss.tools.seam.internal.core.scanner.java.ResolvedAnnotation;
-import org.jboss.tools.seam.internal.core.scanner.java.SeamAnnotations;
import org.jboss.tools.seam.text.ext.SeamExtPlugin;
/**
@@ -86,6 +75,9 @@
return null;
ISeamProject seamProject = SeamCorePlugin.getSeamProject(input.getResource().getProject(), true);
+ if(seamProject == null) {
+ return null;
+ }
SeamELCompletionEngine engine = new SeamELCompletionEngine();
IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
@@ -100,7 +92,8 @@
if (resource instanceof IFile)
file = (IFile) resource;
} catch (JavaModelException e) {
- // Ignore. It is probably because of Java element's resource is not found
+ // It is probably because of Java element's resource is not found
+ SeamExtPlugin.getDefault().logError(e);
}
int[] range = new int[]{wordRegion.getOffset(), wordRegion.getOffset() + wordRegion.getLength()};
@@ -167,7 +160,9 @@
javaElements = engine.getJavaElementsForExpression(
seamProject, file, value);
} catch (StringIndexOutOfBoundsException e) {
+ SeamExtPlugin.getDefault().logError(e);
} catch (BadLocationException e) {
+ SeamExtPlugin.getDefault().logError(e);
}
if (javaElements != null) {
for (IJavaElement javaElement : javaElements) {
@@ -214,7 +209,7 @@
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
}
} catch (JavaModelException jme) {
- // ignore
+ SeamExtPlugin.getDefault().logError(jme);
}
return null;
}
15 years, 9 months
JBoss Tools SVN: r23064 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test: src/org/jboss/tools/vpe/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-06-28 12:44:09 -0400 (Mon, 28 Jun 2010)
New Revision: 23064
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/DOMComparisonException.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComparisonException.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-6543
- file name and XPath of the node where a VPE content test failed is printed now
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-28 14:47:10 UTC (rev 23063)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-28 16:44:09 UTC (rev 23064)
@@ -18,7 +18,8 @@
org.jboss.tools.common.model.ui;bundle-version="3.1.0",
org.jboss.tools.tests;bundle-version="3.1.0";visibility:=reexport,
org.jboss.tools.vpe.resref;bundle-version="3.1.0",
- javax.servlet;bundle-version="2.5.0"
+ javax.servlet;bundle-version="2.5.0",
+ org.eclipse.wst.xml.xpath.core
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/jmock-2.5.1/jmock-2.5.1.jar,
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComparisonException.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComparisonException.java 2010-06-28 14:47:10 UTC (rev 23063)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComparisonException.java 2010-06-28 16:44:09 UTC (rev 23064)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.vpe.ui.test;
-
-/**
- * @author Sergey Dzmitrovich
- *
- */
-public class ComparisonException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 7127064462771778364L;
-
- public ComparisonException() {
- super();
- }
-
- public ComparisonException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public ComparisonException(String message) {
- super(message);
- }
-
- public ComparisonException(Throwable cause) {
- super(cause);
- }
-
-}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-06-28 14:47:10 UTC (rev 23063)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-06-28 16:44:09 UTC (rev 23064)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.ui.test;
import java.io.File;
+import java.io.FileNotFoundException;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -18,6 +19,7 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.test.util.WorkbenchUtils;
import org.jboss.tools.vpe.editor.VpeController;
@@ -81,20 +83,31 @@
.getLocation().toFile();
// get document
+ compareContent(controller, xmlTestFile);
+
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ protected void compareContent(VpeController controller, File xmlTestFile)
+ throws FileNotFoundException {
Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
assertNotNull("Can't get test file, possibly file not exists "+xmlTestFile,xmlTestDocument); //$NON-NLS-1$
List<String> ids = TestDomUtil.getTestIds(xmlTestDocument);
for (String id : ids) {
-
- compareElements(controller, xmlTestDocument, id, id);
+ try{
+ compareElements(controller, xmlTestDocument, id, id);
+ } catch (DOMComparisonException e) {
+ String xPathToNode = XSLTXPathHelper.calculateXPathToNode(e.getNode());
+ String testFileName = xmlTestFile.getPath();
+ String message = e.getMessage();
+ fail(String.format("%s[%s]:\n%s", testFileName, xPathToNode, message)); //$NON-NLS-1$
+ }
}
-
- if (getException() != null) {
- throw getException();
- }
-
}
/**
@@ -104,12 +117,11 @@
* @param elementId
* @param xmlTestId
* @return
- * @throws ComparisonException
+ * @throws DOMComparisonException
*/
- protected void compareElements(VpeController controller,
+ private void compareElements(VpeController controller,
Document xmlTestDocument, String elementId, String xmlTestId)
- throws ComparisonException {
-
+ throws DOMComparisonException {
// get element by id
nsIDOMElement vpeElement = findElementById(controller, elementId);
assertNotNull("Cann't find element with id="+elementId,vpeElement); //$NON-NLS-1$
@@ -125,13 +137,7 @@
assertNotNull(xmlModelElement);
- // compare DOMs
- try {
- TestDomUtil.compareNodes(vpeElement, xmlModelElement);
- } catch (ComparisonException e) {
- fail(e.getMessage());
- }
-
+ TestDomUtil.compareNodes(vpeElement, xmlModelElement);
}
/**
Copied: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/DOMComparisonException.java (from rev 23060, trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComparisonException.java)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/DOMComparisonException.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/DOMComparisonException.java 2010-06-28 16:44:09 UTC (rev 23064)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.vpe.ui.test;
+
+import org.w3c.dom.Node;
+
+/**
+ * @author Sergey Dzmitrovich
+ * @author Yahor Radtsevich (yradtsevich)
+ *
+ */
+public class DOMComparisonException extends Exception {
+ private static final long serialVersionUID = 7127064462771778364L;
+ private Node node;
+
+ public DOMComparisonException(String message, Node node) {
+ super(message);
+ this.node = node;
+ }
+
+ public Node getNode() {
+ return node;
+ }
+}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2010-06-28 14:47:10 UTC (rev 23063)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2010-06-28 16:44:09 UTC (rev 23064)
@@ -18,7 +18,6 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -28,13 +27,9 @@
import org.jboss.tools.common.model.util.XMLUtil;
import org.jboss.tools.jst.css.common.CSSStyleManager;
-import org.jboss.tools.jst.css.common.StyleContainer;
import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
-import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMAttr;
-import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration;
-import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNamedNodeMap;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
@@ -44,8 +39,6 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.ElementCSSInlineStyle;
/**
* @author Sergey Dzmitrovich
@@ -138,23 +131,23 @@
* @param vpeNode
* @param schemeNode
* @return
- * @throws ComparisonException
+ * @throws DOMComparisonException
*/
public static void compareNodes(nsIDOMNode vpeNode, Node modelNode)
- throws ComparisonException {
+ throws DOMComparisonException {
if (!modelNode.getNodeName().equalsIgnoreCase(vpeNode.getNodeName())) {
- throw new ComparisonException("name of tag is \"" //$NON-NLS-1$
+ throw new DOMComparisonException("name of tag is \"" //$NON-NLS-1$
+ vpeNode.getNodeName() + "\"but must be \"" //$NON-NLS-1$
- + modelNode.getNodeName() + "\""); //$NON-NLS-1$
+ + modelNode.getNodeName() + "\"", modelNode); //$NON-NLS-1$
}
if ((modelNode.getNodeValue() != null)
&& (!modelNode.getNodeValue().trim().equalsIgnoreCase(
vpeNode.getNodeValue().trim()))) {
- throw new ComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$
+ throw new DOMComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$
+ " is \"" + vpeNode.getNodeValue().trim() //$NON-NLS-1$
+ "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$
- + "\""); //$NON-NLS-1$
+ + "\"", modelNode); //$NON-NLS-1$
}
// compare node's attributes
@@ -180,10 +173,11 @@
nsIDOMNode vpeChild = vpeChildren.item(realCount++);
if (null == vpeChild) {
- throw new ComparisonException(
+ throw new DOMComparisonException(
"Child of node \"" //$NON-NLS-1$
+ vpeNode.getNodeName()
- + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\"",//$NON-NLS-1$ //$NON-NLS-2$
+ schemeChild);
}
// leave out empty text nodes in vpe dom model
@@ -192,10 +186,11 @@
.length() == 0)))) {
vpeChild = vpeChildren.item(realCount++);
if (null == vpeChild) {
- throw new ComparisonException(
+ throw new DOMComparisonException(
"Child of node \"" //$NON-NLS-1$
+ vpeNode.getNodeName()
- + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ + "\" is \"null\", but should be \"" + schemeChild.getNodeName() + "\"",//$NON-NLS-1$ //$NON-NLS-2$
+ schemeChild);
}
}
@@ -225,7 +220,7 @@
}
private static void compareAttributes(NamedNodeMap modelAttributes,
- nsIDOMNamedNodeMap vpeAttributes) throws ComparisonException {
+ nsIDOMNamedNodeMap vpeAttributes) throws DOMComparisonException {
for (int i = 0; i < modelAttributes.getLength(); i++) {
Attr modelAttr = (Attr) modelAttributes.item(i);
@@ -241,13 +236,13 @@
ILLEGAL_ATTRIBUTES_SEPARATOR);
for (String illegalAttributeName : illegalAttributes) {
if (vpeAttributes.getNamedItem(illegalAttributeName.trim()) != null)
- throw new ComparisonException("illegal attribute :" //$NON-NLS-1$
- + illegalAttributeName);
+ throw new DOMComparisonException("illegal attribute :" //$NON-NLS-1$
+ + illegalAttributeName, modelAttr);
}
} else {
if (vpeAttributes.getNamedItem(name) == null) {
- throw new ComparisonException("there is not : \"" + name //$NON-NLS-1$
- + "\" attribute"); //$NON-NLS-1$
+ throw new DOMComparisonException("there is not : \"" + name //$NON-NLS-1$
+ + "\" attribute", modelAttr); //$NON-NLS-1$
}
nsIDOMAttr vpeAttr = queryInterface(
vpeAttributes.getNamedItem(name), nsIDOMAttr.class);
@@ -280,33 +275,35 @@
* in the style attribute of the vpe element.
*/
if (xmlStyle.size() > vpeStyle.size()) {
- throw new ComparisonException(
+ throw new DOMComparisonException(
"VPE element has less style parameters [" //$NON-NLS-1$
+ vpeStyle.size()
+ "] than was specified [" //$NON-NLS-1$
+ xmlStyle.size() + "]." //$NON-NLS-1$
+ "\n Expected: " + xmlStyle //$NON-NLS-1$
- + "\n Was: " + vpeStyle); //$NON-NLS-1$
+ + "\n Was: " + vpeStyle, //$NON-NLS-1$
+ modelAttr);
} else {
if ((xmlStyle.size() > 0) && (vpeStyle.size() > 0)) {
for (String key : xmlStyle.keySet()) {
if (vpeStyle.containsKey(key)) {
if (!xmlStyle.get(key).equalsIgnoreCase(
vpeStyle.get(key))) {
- throw new ComparisonException(
+ throw new DOMComparisonException(
"Style value for parameter [" //$NON-NLS-1$
+ key
+ "] is different. Expected [" //$NON-NLS-1$
+ xmlStyle.get(key)
+ "] but was [" //$NON-NLS-1$
+ vpeStyle.get(key)
- + "]"); //$NON-NLS-1$
+ + "]", modelAttr); //$NON-NLS-1$
}
} else {
- throw new ComparisonException(
+ throw new DOMComparisonException(
"Style parameter [" //$NON-NLS-1$
+ key
- + "] is missing in the VPE element"); //$NON-NLS-1$
+ + "] is missing in the VPE element", //$NON-NLS-1$
+ modelAttr);
}
}
}
@@ -314,31 +311,30 @@
}
}
if (performComplexStringsComparison) {
- compareComplexStrings(modelAttr.getNodeValue().trim(),
- vpeAttr.getNodeValue().trim());
+ compareComplexAttributes(modelAttr, vpeAttr);
}
}
}
}
- static private void compareComplexStrings(String modelString,
- String vpeString) throws ComparisonException {
+ static private void compareComplexAttributes(Attr modelAttr, nsIDOMAttr vpeAttr)
+ throws DOMComparisonException {
+ String modelString = modelAttr.getNodeValue().trim();
+ String vpeString = vpeAttr.getNodeValue().trim();
if (modelString.startsWith(START_REGEX)
&& modelString.endsWith(END_REGEX)) {
-
String regex = modelString.substring(START_REGEX.length(),
modelString.length() - END_REGEX.length());
Matcher matcher = Pattern.compile(regex).matcher(vpeString);
if (!matcher.find()) {
- throw new ComparisonException("string is\"" + vpeString //$NON-NLS-1$
- + "\" but pattern is \"" + regex + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new DOMComparisonException("string is\"" + vpeString //$NON-NLS-1$
+ + "\" but pattern is \"" + regex + "\"", modelAttr); //$NON-NLS-1$ //$NON-NLS-2$
}
-
} else if (!modelString.equals(vpeString)) {
- throw new ComparisonException("string is\"" + vpeString //$NON-NLS-1$
- + "\" but must be \"" + modelString + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new DOMComparisonException("string is\"" + vpeString //$NON-NLS-1$
+ + "\" but must be \"" + modelString + "\"", modelAttr); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -353,15 +349,11 @@
*/
static private boolean findIgnoreCase(String[] strings,
String requiredString) {
-
for (String string : strings) {
-
if (string.equalsIgnoreCase(requiredString))
return true;
-
}
return false;
}
-
}
15 years, 9 months
JBoss Tools SVN: r23063 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-28 10:47:10 -0400 (Mon, 28 Jun 2010)
New Revision: 23063
Modified:
trunk/build/publish.sh
Log:
fix publish
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-28 14:44:46 UTC (rev 23062)
+++ trunk/build/publish.sh 2010-06-28 14:47:10 UTC (rev 23063)
@@ -72,6 +72,4 @@
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "RORS FOUND: "$cnt >> ${el};
fi
-rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/buildlog.txt $DESTINATION/${JOB_NAME}/
-rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/fail_log.txt $DESTINATION/${JOB_NAME}/
-rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/errorlog.txt $DESTINATION/${JOB_NAME}/
+rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/*LOG.txt $DESTINATION/${JOB_NAME}/
15 years, 9 months
JBoss Tools SVN: r23062 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-28 10:44:46 -0400 (Mon, 28 Jun 2010)
New Revision: 23062
Modified:
trunk/build/publish.sh
Log:
fix publish
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-28 14:17:39 UTC (rev 23061)
+++ trunk/build/publish.sh 2010-06-28 14:44:46 UTC (rev 23062)
@@ -61,13 +61,13 @@
fl=${WORKSPACE}/site/${JOB_NAME}/FAIL_LOG.txt
sed -ne "/<<< FAI/,+9 p" ${bl} | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
-cnt=$(sed -ne "/FAI\|LURE/" ${fl} | wc -l)
+cnt=$(sed -ne "/FAI\|LURE/ p" ${fl} | wc -l)
if [[ $cnt != "0" ]]; then
echo "" >> ${fl}; echo -n "FAI" >> ${fl}; echo -n "LURES FOUND: "$cnt >> ${fl};
fi
el=${WORKSPACE}/site/${JOB_NAME}/ERRORLOG.txt
sed -ne "/<<< ERR/,+9 p" ${bl} | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
-cnt=$(sed -ne "/ERR\|RROR/" ${el} | wc -l)
+cnt=$(sed -ne "/ERR\|RROR/ p" ${el} | wc -l)
if [[ $cnt != "0" ]]; then
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "RORS FOUND: "$cnt >> ${el};
fi
15 years, 9 months