Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2016-06-15 04:13:57 -0400
committerMathieu Cartaud2016-06-15 10:29:59 -0400
commit6477d1125eebfd494f4a3d1a666519e24daedf9d (patch)
treedf98e6aaac6dfb813ea055617a1ce1387064f041 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit
parent5722fba2307aeda65d7367dd302bcd9b20f02a7a (diff)
downloadorg.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.gz
org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.xz
org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.zip
Switch to Eclipse mars.2
Format all non generated classes to get ride of formatter incompatibilities Migrate checkstyle config for checkstyle 6.19 Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/AbstractTestCompareItemProviderAdapter.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestAttributeChangeItemProviderSpec.java8
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestReferenceChangeItemProviderSpec.java68
3 files changed, 40 insertions, 40 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/AbstractTestCompareItemProviderAdapter.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/AbstractTestCompareItemProviderAdapter.java
index 446467334..443c5c187 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/AbstractTestCompareItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/AbstractTestCompareItemProviderAdapter.java
@@ -53,8 +53,8 @@ public class AbstractTestCompareItemProviderAdapter {
* @throws IOException
*/
protected static Comparison getComparison(ResourceScopeProvider scopeProvider) throws IOException {
- final IComparisonScope scope = new DefaultComparisonScope(scopeProvider.getLeft(), scopeProvider
- .getRight(), scopeProvider.getOrigin());
+ final IComparisonScope scope = new DefaultComparisonScope(scopeProvider.getLeft(),
+ scopeProvider.getRight(), scopeProvider.getOrigin());
return EMFCompare.builder().build().compare(scope);
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestAttributeChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestAttributeChangeItemProviderSpec.java
index a24b97270..aca35ac36 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestAttributeChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestAttributeChangeItemProviderSpec.java
@@ -33,10 +33,10 @@ public class TestAttributeChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_EcoreA1() throws IOException {
Comparison comparison = getComparison(new EcoreA1InputData());
- List<AttributeChange> eAllContent_AttributeChange = newArrayList(filter(comparison.eAllContents(),
- AttributeChange.class));
- List<AttributeChange> eAllChildren_AttributeChange = newArrayList(filter(eAllChildren(comparison),
- AttributeChange.class));
+ List<AttributeChange> eAllContent_AttributeChange = newArrayList(
+ filter(comparison.eAllContents(), AttributeChange.class));
+ List<AttributeChange> eAllChildren_AttributeChange = newArrayList(
+ filter(eAllChildren(comparison), AttributeChange.class));
assertEquals(eAllContent_AttributeChange.size(), eAllChildren_AttributeChange.size());
assertTrue(eAllChildren_AttributeChange.containsAll(eAllContent_AttributeChange));
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestReferenceChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestReferenceChangeItemProviderSpec.java
index 603ee6dce..61aafd7b0 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestReferenceChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestReferenceChangeItemProviderSpec.java
@@ -31,8 +31,8 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_AudioVisualItem() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Match audioVisualItem_Match = getMatchWithFeatureValue(ePackage_MatchChildren, "name", //$NON-NLS-1$
"AudioVisualItem"); //$NON-NLS-1$
Collection<?> audioVisualItem_MatchChildren = adaptAsITreeItemContentProvider(audioVisualItem_Match)
@@ -51,8 +51,8 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_Book() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Match book_Match = getMatchWithFeatureValue(ePackage_MatchChildren, "name", "Book"); //$NON-NLS-1$ //$NON-NLS-2$
Collection<?> book_MatchChildren = adaptAsITreeItemContentProvider(book_Match)
.getChildren(book_Match);
@@ -70,8 +70,8 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_Borrowable() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Match borrowableCategory_Match = getMatchWithFeatureValue(ePackage_MatchChildren, "name", //$NON-NLS-1$
"Borrowable"); //$NON-NLS-1$
Collection<?> borrowable_MatchChildren = adaptAsITreeItemContentProvider(borrowableCategory_Match)
@@ -84,8 +84,8 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_BookCategory() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Match bookCategory_Match = getMatchWithFeatureValue(ePackage_MatchChildren, "name", "BookCategory"); //$NON-NLS-1$ //$NON-NLS-2$
Collection<?> bookCategory_MatchChildren = adaptAsITreeItemContentProvider(bookCategory_Match)
.getChildren(bookCategory_Match);
@@ -96,13 +96,13 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
bookCategory_MatchChildren, "name", "Encyclopedia"); //$NON-NLS-1$ //$NON-NLS-2$
ReferenceChange mangaReferenceChange = getReferenceChangeWithFeatureValue(bookCategory_MatchChildren,
"name", "Manga"); //$NON-NLS-1$ //$NON-NLS-2$
- ReferenceChange manhwaReferenceChange = getReferenceChangeWithFeatureValue(
- bookCategory_MatchChildren, "name", "Manhwa"); //$NON-NLS-1$ //$NON-NLS-2$
+ ReferenceChange manhwaReferenceChange = getReferenceChangeWithFeatureValue(bookCategory_MatchChildren,
+ "name", "Manhwa"); //$NON-NLS-1$ //$NON-NLS-2$
- assertTrue(adaptAsITreeItemContentProvider(dictionaryReferenceChange).getChildren(
- dictionaryReferenceChange).isEmpty());
- assertTrue(adaptAsITreeItemContentProvider(encyclopediaReferenceChange).getChildren(
- encyclopediaReferenceChange).isEmpty());
+ assertTrue(adaptAsITreeItemContentProvider(dictionaryReferenceChange)
+ .getChildren(dictionaryReferenceChange).isEmpty());
+ assertTrue(adaptAsITreeItemContentProvider(encyclopediaReferenceChange)
+ .getChildren(encyclopediaReferenceChange).isEmpty());
assertTrue(adaptAsITreeItemContentProvider(mangaReferenceChange).getChildren(mangaReferenceChange)
.isEmpty());
assertTrue(adaptAsITreeItemContentProvider(manhwaReferenceChange).getChildren(manhwaReferenceChange)
@@ -113,16 +113,16 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_Magazine1() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Collection<?> magazineChildren = null;
for (ReferenceChange referenceChange : filter(ePackage_MatchChildren, ReferenceChange.class)) {
EClass eClass = (EClass)referenceChange.getValue();
if ("Magazine".equals(eClass.getName()) //$NON-NLS-1$
&& "CirculatingItem".equals(eClass.getESuperTypes().get(0).getName())) { //$NON-NLS-1$
- magazineChildren = adaptAsITreeItemContentProvider(referenceChange).getChildren(
- referenceChange);
+ magazineChildren = adaptAsITreeItemContentProvider(referenceChange)
+ .getChildren(referenceChange);
assertEquals(0, magazineChildren.size());
break;
}
@@ -133,16 +133,16 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_Magazine2() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Collection<?> magazineChildren = null;
for (ReferenceChange referenceChange : filter(ePackage_MatchChildren, ReferenceChange.class)) {
EClass eClass = (EClass)referenceChange.getValue();
if ("Magazine".equals(eClass.getName()) //$NON-NLS-1$
&& "Periodical".equals(eClass.getESuperTypes().get(0).getName())) { //$NON-NLS-1$
- magazineChildren = adaptAsITreeItemContentProvider(referenceChange).getChildren(
- referenceChange);
+ magazineChildren = adaptAsITreeItemContentProvider(referenceChange)
+ .getChildren(referenceChange);
assertEquals(0, magazineChildren.size());
break;
}
@@ -153,8 +153,8 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_Periodical() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
ReferenceChange periodical_ReferenceChange = getReferenceChangeWithFeatureValue(
ePackage_MatchChildren, "name", "Periodical"); //$NON-NLS-1$ //$NON-NLS-2$
Collection<?> periodical_ReferenceChangeChildren = adaptAsITreeItemContentProvider(
@@ -167,18 +167,18 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_Person() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
Match person_Match = getMatchWithFeatureValue(ePackage_MatchChildren, "name", "Person"); //$NON-NLS-1$ //$NON-NLS-2$
- Collection<?> person_MatchChildren = adaptAsITreeItemContentProvider(person_Match).getChildren(
- person_Match);
+ Collection<?> person_MatchChildren = adaptAsITreeItemContentProvider(person_Match)
+ .getChildren(person_Match);
assertEquals(6, person_MatchChildren.size());
- ReferenceChange issuesPerYearChange = getReferenceChangeWithFeatureValue(person_MatchChildren,
- "name", "firstName"); //$NON-NLS-1$ //$NON-NLS-2$
- Collection<?> firstNameChildren = adaptAsITreeItemContentProvider(issuesPerYearChange).getChildren(
- issuesPerYearChange);
+ ReferenceChange issuesPerYearChange = getReferenceChangeWithFeatureValue(person_MatchChildren, "name", //$NON-NLS-1$
+ "firstName"); //$NON-NLS-1$
+ Collection<?> firstNameChildren = adaptAsITreeItemContentProvider(issuesPerYearChange)
+ .getChildren(issuesPerYearChange);
assertEquals(0, firstNameChildren.size());
}
@@ -186,8 +186,8 @@ public class TestReferenceChangeItemProviderSpec extends AbstractTestCompareItem
public void testGetChildren_TitledItem() throws IOException {
Match ePackageMatch = TestMatchItemProviderSpec.getEcoreA1_EPackageMatch();
- Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch).getChildren(
- ePackageMatch);
+ Collection<?> ePackage_MatchChildren = adaptAsITreeItemContentProvider(ePackageMatch)
+ .getChildren(ePackageMatch);
ReferenceChange titledItem_ReferenceChange = getReferenceChangeWithFeatureValue(
ePackage_MatchChildren, "name", "TitledItem"); //$NON-NLS-1$ //$NON-NLS-2$

Back to the top