commit: c3163081734d9d80c36d76fc86cea4ef8266de24
[log]
author: Arthur Daussy <arthur.daussy@obeo.fr>
Fri Nov 28 15:53:22 2014 +0100
committer: Axel RICHARD <axel.richard@obeo.fr>
Mon Dec 01 03:52:53 2014 -0500
tree: ecd7f383988a042fd66eb397f4c6e2b06c2b8fae
parent: 39b25da951fdaec8dc79752b1f2b1eae68a2c8ed [diff]

Refactors application tests

* Extracts all environment setup in a new external class in order to
make it more reusable (for example reuse those environments for
integration tests)
* Replaces CHER prefix bu CHE.
* Adds '@SuppressWarnings("nls")' in test classes.
* Removes useless code.

Change-Id: I24b11ec79479babb9929960149c9db550643ad31

plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/AbstractApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/AbstractLogicalCommandApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java[diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/ContextSetup.java[Added - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_a/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_a/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_a/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_a/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_a/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_a/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_b/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_b/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_b/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_b/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_b/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_b/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_c/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_c/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_c/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_c/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_c/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_c/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_d/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_d/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_d/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_d/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHE003/branch_d/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/CHER003/branch_d/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_a/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_a/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_a/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_a/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_a/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_a/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_b/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_b/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_b/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_b/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_b/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_b/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_c/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_c/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_c/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_c/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_c/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_c/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_d/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_d/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_d/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_d/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/branch_d/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/branch_d/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/conflict/resolution1/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/conflict/resolution1/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/conflict/resolution1/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/conflict/resolution1/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/conflict/resolution1/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/conflict/resolution1/model.uml - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/conflict/resolution2/model.di[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/conflict/resolution2/model.di - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/conflict/resolution2/model.notation[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/conflict/resolution2/model.notation - diff]
plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHE002/conflict/resolution2/model.uml[Renamed from plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/CHER002/conflict/resolution2/model.uml - diff]

36 files changed

tree: ecd7f383988a042fd66eb397f4c6e2b06c2b8fae

README.md

EMFCompareGitPGM

This is a temporary repository holding the work on the EMF Compare command line application. This application aims to handle EMF model on git repository from a command line tool. This repository will soon migrate to the eclipse foundation.