Skip to content

Commit

Permalink
Take over some regeneration changes
Browse files Browse the repository at this point in the history
Synchronized one more time with internal head

Closes #3
  • Loading branch information
Roman Mitin authored and Roman Mitin committed Dec 8, 2017
1 parent 8d63c8a commit 4a602f4
Show file tree
Hide file tree
Showing 67 changed files with 2,546 additions and 2,518 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
*******************************************************************************/
package com.avaloq.tools.ddk.check.validation;

import junit.framework.TestCase;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.xtext.junit4.InjectWith;
import org.eclipse.xtext.junit4.XtextRunner;
Expand All @@ -21,6 +19,8 @@
import com.avaloq.tools.ddk.check.CheckUiInjectorProvider;
import com.google.inject.Inject;

import junit.framework.TestCase;


/**
* Tests for com.avaloq.tools.ddk.check.validation.CheckJavaValidatorUtil.
Expand All @@ -43,6 +43,8 @@ public class CheckJavaValidatorUtilTest extends TestCase {

private static final String CONTAINS_ILLEGAL_CHARACTER_WHITESPACE = "Contains illegal character. (whitespace)";

private static final String CONTAINS_ILLEGAL_CHARACTER_DOLLAR = "Contains illegal character. (dollar)";

private static final String STARTS_WITH_ILLEGAL_CHARACTER_DOT = "Starts with illegal character. (dot)";

private static final String STARTS_WITH_UPPERCASE_LETTER = "Starts with uppercase letter";
Expand Down Expand Up @@ -75,6 +77,7 @@ public void projectNameIsInvalid() {
assertTrue(NAME_IS_EMPTY, util.checkProjectName(EMPTY_STRING).matches(IStatus.ERROR));
assertTrue(STARTS_WITH_UPPERCASE_LETTER, util.checkProjectName("Project.name").matches(IStatus.ERROR));
assertTrue(STARTS_WITH_ILLEGAL_CHARACTER_DOT, util.checkProjectName(".projectname").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_DOLLAR, util.checkCatalogName("client$project").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_WHITESPACE, util.checkProjectName("project.name ").matches(IStatus.ERROR));
assertTrue(CONTAINS_UPPERCASE_LETTER, util.checkProjectName("proJect.Name").matches(IStatus.ERROR));
assertTrue(CONTAINS_DOUBLE_DOT, util.checkProjectName("project..name").matches(IStatus.ERROR));
Expand All @@ -100,6 +103,7 @@ public void packageNameIsInvalid() {
assertTrue(STARTS_WITH_UPPERCASE_LETTER, util.checkPackageName("Package.name").matches(IStatus.ERROR));
assertTrue(STARTS_WITH_ILLEGAL_CHARACTER_DOT, util.checkPackageName(".packagename").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_WHITESPACE, util.checkPackageName("packagename ").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_DOLLAR, util.checkCatalogName("client$package").matches(IStatus.ERROR));
assertTrue(CONTAINS_UPPERCASE_LETTER, util.checkPackageName("package.Name").matches(IStatus.ERROR));
assertTrue(CONTAINS_DOUBLE_DOT, util.checkPackageName("package..name").matches(IStatus.ERROR));
}
Expand All @@ -121,6 +125,7 @@ public void catalogNameIsInvalid() {
assertTrue(NAME_IS_EMPTY, util.checkCatalogName(EMPTY_STRING).matches(IStatus.ERROR));
assertTrue(QUALIFIED_NAME, util.checkCatalogName("Catalog.Name").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER, util.checkCatalogName(",Catalogname").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_DOLLAR, util.checkCatalogName("Client$Catalog").matches(IStatus.ERROR));
}

/**
Expand Down Expand Up @@ -149,6 +154,7 @@ public void checkNameIsInvalid() {
assertTrue(NAME_IS_EMPTY, util.checkCheckName(EMPTY_STRING).matches(IStatus.ERROR));
assertTrue(QUALIFIED_NAME, util.checkCheckName("Check.name").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER, util.checkCheckName(",checkname").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_DOLLAR, util.checkCatalogName("client$check").matches(IStatus.ERROR));
}

/**
Expand Down Expand Up @@ -178,6 +184,7 @@ public void categoryNameIsInvalid() {
assertTrue(NAME_IS_EMPTY, util.checkCategoryName(EMPTY_STRING).matches(IStatus.ERROR));
assertTrue(QUALIFIED_NAME, util.checkCategoryName("Category.name").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER, util.checkCategoryName("%categoryname").matches(IStatus.ERROR));
assertTrue(CONTAINS_ILLEGAL_CHARACTER_DOLLAR, util.checkCatalogName("Client$Category").matches(IStatus.ERROR));
}

/**
Expand All @@ -189,4 +196,3 @@ public void categoryNameIsDiscouraged() {
assertTrue(STARTS_WITH_AND_CONTAINS_UPPERCASE_LETTERS, util.checkCategoryName("categoryName").matches(IStatus.WARNING));
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.Category#getId <em>Id</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Category#getLabel <em>Label</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Category#getChecks <em>Checks</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getCategory()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.Check#getSeverityRange <em>Severity Range</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Check#isFinal <em>Final</em>}</li>
Expand All @@ -24,6 +23,7 @@
* <li>{@link com.avaloq.tools.ddk.check.check.Check#getContexts <em>Contexts</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Check#getMessage <em>Message</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getCheck()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getPackageName <em>Package Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getImports <em>Imports</em>}</li>
Expand All @@ -28,6 +27,7 @@
* <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getChecks <em>Checks</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getMembers <em>Members</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getCheckCatalog()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.Context#getContextVariable <em>Context Variable</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Context#getConstraint <em>Constraint</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getContext()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.ContextVariable#getType <em>Type</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.ContextVariable#getName <em>Name</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getContextVariable()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.Documented#getDescription <em>Description</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getDocumented()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getType <em>Type</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getName <em>Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getRight <em>Right</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getLabel <em>Label</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getFormalParameter()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.Implementation#getName <em>Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Implementation#getContext <em>Context</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getImplementation()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.ImplicitlyNamed#getName <em>Name</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getImplicitlyNamed()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.Member#getAnnotations <em>Annotations</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Member#getType <em>Type</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Member#getName <em>Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.Member#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getMember()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ public enum SeverityKind implements Enumerator
* Returns the '<em><b>Severity Kind</b></em>' literal with the specified literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param literal the literal.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static SeverityKind get(String literal)
Expand All @@ -167,8 +165,6 @@ public static SeverityKind get(String literal)
* Returns the '<em><b>Severity Kind</b></em>' literal with the specified name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param name the name.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static SeverityKind getByName(String name)
Expand All @@ -188,8 +184,6 @@ public static SeverityKind getByName(String name)
* Returns the '<em><b>Severity Kind</b></em>' literal with the specified integer value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the integer value.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static SeverityKind get(int value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.SeverityRange#getMinSeverity <em>Min Severity</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.SeverityRange#getMaxSeverity <em>Max Severity</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getSeverityRange()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ public enum TriggerKind implements Enumerator
* Returns the '<em><b>Trigger Kind</b></em>' literal with the specified literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param literal the literal.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static TriggerKind get(String literal)
Expand All @@ -141,8 +139,6 @@ public static TriggerKind get(String literal)
* Returns the '<em><b>Trigger Kind</b></em>' literal with the specified name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param name the name.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static TriggerKind getByName(String name)
Expand All @@ -162,8 +158,6 @@ public static TriggerKind getByName(String name)
* Returns the '<em><b>Trigger Kind</b></em>' literal with the specified integer value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the integer value.
* @return the matching enumerator or <code>null</code>.
* @generated
*/
public static TriggerKind get(int value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.XGuardExpression#getGuard <em>Guard</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getXGuardExpression()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getCheck <em>Check</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getMarkerFeature <em>Marker Feature</em>}</li>
Expand All @@ -26,6 +25,7 @@
* <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getIssueCode <em>Issue Code</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getIssueData <em>Issue Data</em>}</li>
* </ul>
* </p>
*
* @see com.avaloq.tools.ddk.check.check.CheckPackage#getXIssueExpression()
* @model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getName <em>Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getId <em>Id</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getLabel <em>Label</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getChecks <em>Checks</em>}</li>
* </ul>
* </p>
*
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getPackageName <em>Package Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getImports <em>Imports</em>}</li>
Expand All @@ -47,6 +46,7 @@
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getChecks <em>Checks</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getMembers <em>Members</em>}</li>
* </ul>
* </p>
*
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getName <em>Name</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getSeverityRange <em>Severity Range</em>}</li>
Expand All @@ -46,6 +45,7 @@
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getContexts <em>Contexts</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getMessage <em>Message</em>}</li>
* </ul>
* </p>
*
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextImpl#getContextVariable <em>Context Variable</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextImpl#getConstraint <em>Constraint</em>}</li>
* </ul>
* </p>
*
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextVariableImpl#getType <em>Type</em>}</li>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextVariableImpl#getName <em>Name</em>}</li>
* </ul>
* </p>
*
* @generated
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
* <li>{@link com.avaloq.tools.ddk.check.check.impl.DocumentedImpl#getDescription <em>Description</em>}</li>
* </ul>
* </p>
*
* @generated
*/
Expand Down
Loading

0 comments on commit 4a602f4

Please sign in to comment.