Merge pull request #1830 from mundacho/master

[eclipse/xtext#1854] Move AssertableDiagnostics to xtext.testing.
This commit is contained in:
Sebastian Zarnekow 2022-02-15 19:02:43 +01:00 committed by GitHub
commit b082274403
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 4 deletions

View file

@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.xtext.validation;
package org.eclipse.xtext.testing.validation;
import static org.eclipse.emf.common.util.Diagnostic.*;
@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map.Entry;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.xtext.validation.AbstractValidationDiagnostic;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
@ -27,6 +28,7 @@ import com.google.common.collect.Iterables;
/**
* @author Moritz Eysholdt - Initial contribution and API
* @since 2.26
*
*/
public class AssertableDiagnostics {

View file

@ -14,8 +14,9 @@ import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.xtext.testing.validation.AssertableDiagnostics;
import org.eclipse.xtext.testing.validation.AssertableDiagnostics.DiagnosticPredicate;
import org.eclipse.xtext.tests.AbstractXtextTests;
import org.eclipse.xtext.validation.AssertableDiagnostics.DiagnosticPredicate;
import org.eclipse.xtext.validation.IConcreteSyntaxValidator.DiagnosticChainAcceptor;
import org.eclipse.xtext.validation.impl.ConcreteSyntaxDiagnosticProvider.ConcreteSyntaxFeatureDiagnostic;

View file

@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.Diagnostician;
import org.eclipse.xtext.testing.validation.AssertableDiagnostics;
/**
* @author Moritz Eysholdt - Initial contribution and API

View file

@ -8,7 +8,7 @@
*******************************************************************************/
package org.eclipse.xtext.validation;
import static org.eclipse.xtext.validation.AssertableDiagnostics.*;
import static org.eclipse.xtext.testing.validation.AssertableDiagnostics.*;
import static org.eclipse.xtext.validation.IConcreteSyntaxDiagnosticProvider.*;
import java.util.List;

View file

@ -12,6 +12,7 @@ import java.util.Iterator;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.xtext.testing.validation.AssertableDiagnostics;
import org.junit.Assert;
import org.junit.Test;

View file

@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.impl.EValidatorRegistryImpl;
import org.eclipse.emf.ecore.util.Diagnostician;
import org.eclipse.xtext.Constants;
import org.eclipse.xtext.testing.validation.AssertableDiagnostics;
import org.eclipse.xtext.validation.AbstractDeclarativeValidator.State;
import com.google.inject.Inject;

View file

@ -8,7 +8,7 @@
*******************************************************************************/
package org.eclipse.xtext.validation;
import static org.eclipse.xtext.validation.AssertableDiagnostics.*;
import static org.eclipse.xtext.testing.validation.AssertableDiagnostics.*;
import java.util.Arrays;
import java.util.List;