1 files changed, 127 insertions, 127 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java
index e80c4a62b..df62d3972 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java
@@ -1,127 +1,127 @@
-/**
- * Copyright (c) 2011, 2014 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.emf.compare.tests.framework.junit.internal;
-
-import com.google.common.collect.Lists;
-
-import java.util.List;
-
-import org.eclipse.emf.compare.tests.framework.NotifierTuple;
-import org.eclipse.emf.compare.tests.framework.junit.annotation.BeforeMatch;
-import org.eclipse.emf.compare.tests.framework.junit.annotation.ConflictTest;
-import org.eclipse.emf.compare.tests.framework.junit.annotation.DiffTest;
-import org.eclipse.emf.compare.tests.framework.junit.annotation.MatchTest;
-import org.eclipse.emf.compare.tests.framework.junit.annotation.UseCase;
-import org.junit.Assert;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-
-/**
- * This particular implementation of a runner will be used to run the tests of a use case.
- * 
- * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
- */
-public class UseCaseRunner extends BlockJUnit4ClassRunner {
-	/** The method we are to invoke in order to retrieve the use case. */
-	private FrameworkMethod useCase;
-
-	/**
-	 * Instantiates our runner.
-	 * 
-	 * @param clazz
-	 *            The java class containing our tests.
-	 * @param useCaseMethod
-	 *            The method we are to invoke in order to retrieve the use case.
-	 * @throws InitializationError
-	 *             Thrown if the initialization failed somehow.
-	 */
-	public UseCaseRunner(Class<?> clazz, FrameworkMethod useCaseMethod) throws InitializationError {
-		super(clazz);
-		this.useCase = useCaseMethod;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.junit.runners.BlockJUnit4ClassRunner#testName(org.junit.runners.model.FrameworkMethod)
-	 */
-	@Override
-	protected String testName(FrameworkMethod method) {
-		// Replace the standard description to make it unique so that the JUnit view understands that these
-		// are two distinct tests.
-		final StringBuilder name = new StringBuilder();
-		name.append(super.testName(method));
-		name.append(" - "); //$NON-NLS-1$
-		name.append(useCase.getAnnotation(UseCase.class).value());
-
-		return name.toString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.junit.runners.ParentRunner#getName()
-	 */
-	@Override
-	protected String getName() {
-		final StringBuilder name = new StringBuilder();
-		name.append(useCase.getAnnotation(UseCase.class).value());
-		return name.toString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.junit.runners.BlockJUnit4ClassRunner#computeTestMethods()
-	 */
-	@Override
-	protected List<FrameworkMethod> computeTestMethods() {
-		final List<FrameworkMethod> allMethods = Lists.newArrayList(getTestClass().getAnnotatedMethods(
-				MatchTest.class));
-		allMethods.addAll(getTestClass().getAnnotatedMethods(DiffTest.class));
-		allMethods.addAll(getTestClass().getAnnotatedMethods(ConflictTest.class));
-
-		return allMethods;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.junit.runners.BlockJUnit4ClassRunner#methodBlock(org.junit.runners.model.FrameworkMethod)
-	 */
-	@Override
-	protected Statement methodBlock(FrameworkMethod method) {
-		Object testObject = null;
-		try {
-			testObject = createTest();
-		} catch (Exception e) {
-			Assert.fail(e.getMessage());
-		}
-
-		final ResultStatement<NotifierTuple> useCaseStatement = new UseCaseStatement(useCase, testObject);
-
-		final Statement result;
-		if (method.getAnnotation(MatchTest.class) != null) {
-			final List<FrameworkMethod> befores = getTestClass().getAnnotatedMethods(BeforeMatch.class);
-			result = new MatchStatement(testObject, useCaseStatement, befores, method);
-		} else if (method.getAnnotation(DiffTest.class) != null) {
-			result = new DiffStatement(testObject, useCaseStatement, method);
-		} else if (method.getAnnotation(ConflictTest.class) != null) {
-			result = new ConflictStatement(testObject, useCaseStatement, method);
-		} else {
-			// TODO merge test
-			result = null;
-		}
-		return result;
-	}
-}
+/**
+ * Copyright (c) 2011, 2014 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ *     Obeo - initial API and implementation
+ */
+package org.eclipse.emf.compare.tests.framework.junit.internal;
+
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+import org.eclipse.emf.compare.tests.framework.NotifierTuple;
+import org.eclipse.emf.compare.tests.framework.junit.annotation.BeforeMatch;
+import org.eclipse.emf.compare.tests.framework.junit.annotation.ConflictTest;
+import org.eclipse.emf.compare.tests.framework.junit.annotation.DiffTest;
+import org.eclipse.emf.compare.tests.framework.junit.annotation.MatchTest;
+import org.eclipse.emf.compare.tests.framework.junit.annotation.UseCase;
+import org.junit.Assert;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+/**
+ * This particular implementation of a runner will be used to run the tests of a use case.
+ * 
+ * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ */
+public class UseCaseRunner extends BlockJUnit4ClassRunner {
+	/** The method we are to invoke in order to retrieve the use case. */
+	private FrameworkMethod useCase;
+
+	/**
+	 * Instantiates our runner.
+	 * 
+	 * @param clazz
+	 *            The java class containing our tests.
+	 * @param useCaseMethod
+	 *            The method we are to invoke in order to retrieve the use case.
+	 * @throws InitializationError
+	 *             Thrown if the initialization failed somehow.
+	 */
+	public UseCaseRunner(Class<?> clazz, FrameworkMethod useCaseMethod) throws InitializationError {
+		super(clazz);
+		this.useCase = useCaseMethod;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.junit.runners.BlockJUnit4ClassRunner#testName(org.junit.runners.model.FrameworkMethod)
+	 */
+	@Override
+	protected String testName(FrameworkMethod method) {
+		// Replace the standard description to make it unique so that the JUnit view understands that these
+		// are two distinct tests.
+		final StringBuilder name = new StringBuilder();
+		name.append(super.testName(method));
+		name.append(" - "); //$NON-NLS-1$
+		name.append(useCase.getAnnotation(UseCase.class).value());
+
+		return name.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.junit.runners.ParentRunner#getName()
+	 */
+	@Override
+	protected String getName() {
+		final StringBuilder name = new StringBuilder();
+		name.append(useCase.getAnnotation(UseCase.class).value());
+		return name.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.junit.runners.BlockJUnit4ClassRunner#computeTestMethods()
+	 */
+	@Override
+	protected List<FrameworkMethod> computeTestMethods() {
+		final List<FrameworkMethod> allMethods = Lists.newArrayList(getTestClass().getAnnotatedMethods(
+				MatchTest.class));
+		allMethods.addAll(getTestClass().getAnnotatedMethods(DiffTest.class));
+		allMethods.addAll(getTestClass().getAnnotatedMethods(ConflictTest.class));
+
+		return allMethods;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.junit.runners.BlockJUnit4ClassRunner#methodBlock(org.junit.runners.model.FrameworkMethod)
+	 */
+	@Override
+	protected Statement methodBlock(FrameworkMethod method) {
+		Object testObject = null;
+		try {
+			testObject = createTest();
+		} catch (Exception e) {
+			Assert.fail(e.getMessage());
+		}
+
+		final ResultStatement<NotifierTuple> useCaseStatement = new UseCaseStatement(useCase, testObject);
+
+		final Statement result;
+		if (method.getAnnotation(MatchTest.class) != null) {
+			final List<FrameworkMethod> befores = getTestClass().getAnnotatedMethods(BeforeMatch.class);
+			result = new MatchStatement(testObject, useCaseStatement, befores, method);
+		} else if (method.getAnnotation(DiffTest.class) != null) {
+			result = new DiffStatement(testObject, useCaseStatement, method);
+		} else if (method.getAnnotation(ConflictTest.class) != null) {
+			result = new ConflictStatement(testObject, useCaseStatement, method);
+		} else {
+			// TODO merge test
+			result = null;
+		}
+		return result;
+	}
+}