[jbosstools-commits] JBoss Tools SVN: r33932 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 3 other directories.

Monday, 15 August 2011


Author: akazakov
Date: 2011-08-15 15:06:42 -0400 (Mon, 15 Aug 2011)
New Revision: 33932

Modified:
  
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
  
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/tck/TCKTest.java
  
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
  
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9453

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	2011-08-15
18:32:48 UTC (rev 33931)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java	2011-08-15
19:06:42 UTC (rev 33932)
@@ -225,7 +225,6 @@
 			throws ValidationException {
 		init(project, validationHelper, context, manager, reporter);
 		displaySubtask(CDIValidationMessages.SEARCHING_RESOURCES, new
String[]{project.getName()});
-
 		if (cdiProject == null) {
 			return OK_STATUS;
 		}
@@ -331,6 +330,7 @@
 		if (cdiProject == null) {
 			return OK_STATUS;
 		}
+		
 		displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[] { projectName
});
 
 		Set<IFile> filesToValidate = new HashSet<IFile>();

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	2011-08-15
18:32:48 UTC (rev 33931)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java	2011-08-15
19:06:42 UTC (rev 33932)
@@ -14,6 +14,7 @@
 import junit.framework.TestSuite;
 
 import org.eclipse.jdt.internal.core.JavaModelManager;
+import org.eclipse.wst.validation.ValidationFramework;
 import org.jboss.tools.cdi.core.test.ca.BeansXmlCATest;
 import org.jboss.tools.cdi.core.test.extension.ExtensionFactoryTest;
 import org.jboss.tools.cdi.core.test.extension.ExtensionManagerTest;
@@ -68,6 +69,7 @@
 	public static Test suite() {
 		// it could be done here because it is not needed to be enabled back
 		JavaModelManager.getIndexManager().disable();
+		ValidationFramework.getDefault().suspendAllValidation(true);
 
 		ValidationExceptionTest.initLogger();
 

Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java	2011-08-15
18:32:48 UTC (rev 33931)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java	2011-08-15
19:06:42 UTC (rev 33932)
@@ -76,9 +76,10 @@
 			try {
 				tckProject = findTestProject();
 				if(tckProject==null || !tckProject.exists()) {
-					ValidatorManager.setStatus(CoreValidationTest.VALIDATION_STATUS);
+//					ValidatorManager.setStatus(CoreValidationTest.VALIDATION_STATUS);
 					tckProject = importPreparedProject("/");
-					TestUtil.waitForValidation();
+					TestUtil._waitForValidation(tckProject);
+//					TestUtil.waitForValidation();
 				}
 			} catch (Exception e) {
 				e.printStackTrace();

Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java	2011-08-15
18:32:48 UTC (rev 33931)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java	2011-08-15
19:06:42 UTC (rev 33932)
@@ -36,8 +36,13 @@
 		IFile testBean =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
 		IFile testBeanImpl =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation");
 		testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new
NullProgressMonitor());
+
+System.out.println("START VALIDATING!!!!");
+
 		TestUtil.validate(testBean);
 
+System.out.println("END VALIDATING!!!!");
+
 		AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection,
CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
 
 		testBeanImpl =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");

Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java	2011-08-15
18:32:48 UTC (rev 33931)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java	2011-08-15
19:06:42 UTC (rev 33932)
@@ -1,5 +1,9 @@
 package org.jboss.tools.jst.jsp.test;
 
+import java.lang.reflect.InvocationTargetException;
+
+import junit.framework.TestCase;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
@@ -8,6 +12,11 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.FilterUtil;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.RegistryConstants;
 import org.eclipse.wst.validation.internal.ValManager;
 import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation;
 import org.eclipse.wst.validation.internal.operations.ValidatorSubsetOperation;
@@ -39,19 +48,19 @@
 						IProject project = getProject();
 						if (ValidationFramework.getDefault().isSuspended(project))return;
 						if (ValManager.getDefault().isDisabled(project))return;
-						
+
 						if (!areValidatorsEnabled()) {
 							// save some processing time...
 							return;
 						}
-						
+
 						final WorkbenchReporter reporter = new WorkbenchReporter(getProject(),
progressMonitor) {
 							public void
addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator validator,
org.eclipse.wst.validation.internal.provisional.core.IMessage message) {
 								super.addMessage(validator, message);
 								System.out.println(message);
 							};
 						};
-	
+
 						try {
 							// Periodically check if the user has canceled the operation
 							checkCanceled(reporter);
@@ -68,21 +77,39 @@
 			ValidationFramework.getDefault().suspendAllValidation(true);
 		}
 	}
-	
+
 	public static void validate(IResource resource) throws CoreException {
 		validate(resource.getProject(), new IResource[] {resource});
 	}
-	
-	public static void validate(IProject project, IResource[] resource) throws CoreException
{
+
+	public static void validate(IProject project, IResource[] resources) throws
CoreException {
+		ValidationFramework.getDefault().suspendAllValidation(true);
 		project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
 		ValidationFramework.getDefault().suspendAllValidation(false);
 		try {
-			new ValidatorSubsetOperation(project,"java",resource,false).run(new
NullProgressMonitor());
+			new IncrimantalValidatorOperation(project, resources).run(new NullProgressMonitor());
+//			new EnabledIncrementalValidatorsOperation(project, resources).run(new
NullProgressMonitor());
+//			new ValidatorSubsetOperation(project,"java",resource,false).run(new
NullProgressMonitor());
+		} catch (OperationCanceledException e) {
+			e.printStackTrace();
+			TestCase.fail(e.getMessage());
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+			TestCase.fail(e.getMessage());
 		} finally {
 			ValidationFramework.getDefault().suspendAllValidation(true);
 		}
 	}
-	
+
+	private static class IncrimantalValidatorOperation extends ValidatorSubsetOperation {
+		public IncrimantalValidatorOperation(IProject project, Object[] changedResources)
throws InvocationTargetException {
+			super(project, shouldForce(changedResources),
RegistryConstants.ATT_RULE_GROUP_DEFAULT, false);
+			ProjectConfiguration prjp =
ConfigurationManager.getManager().getProjectConfiguration(project);
+			setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+			setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources,
false));
+		}
+	}
+
 	public static boolean waitForValidation() throws CoreException{
 		for (int i = 0; i < 50; i++) {
 			if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r33932 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 3 other directories.