Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [qvtd-dev] Branch merging

Hi Horacio

Thunderbird tells me I replied to this, but doesn't show my reply and I don't recall reading it.

My instant reaction, and this makes me sure I didn't read it, is: do I like "...test..."? It is usually tests. But the test plugin/package names in Eclipse OCL leave something to be desired.

Looking around, many projects have ....tests for plugins that provide tests. EMF has emf.test...

"examples" has another meaning, "models" has too many meanings, so on "test.samples..." seems good.

paskage names should be lowercase, so how about?

org.eclipse.qvtd.test.samples.uml2rdbms
org.eclipse.qvtd.test.samples.upper2lower
org.eclipse.qvtd.test.samples.hsv2hls

all in the tests/org.eclipse.qvtd.test.samples plugin.

	Regards

		Ed





On 19/02/2015 11:52, Horacio Hoyos Rodriguez wrote:
Hi,

I think we should also consolidate the interpreter/CG execution examples.
Currently both the QVTi tests and the MTC tests need input and validation
models to test execution of the transformation. IF we are using the same
examples, this causes duplicate models and we are not comparing the direct
QVTi to the compiled QVTi approach.

I propose a org.eclipse.qvtd.test.samples pluging, with a package for each
of the tests, e.g.

org.eclipse.qvtd.test.samples.UML2RDBMS
org.eclipse.qvtd.test.samples.Upper2Lower
org.eclipse.qvtd.test.samples.HSV2HLS

Each package contains one or more couple of models. Each couple consists
of an input model (e.g. SimpleUMLPeople) and a validation output model
(e.g. SimpleRDMSPeople_expected).  In the future this will make it easy to
add additional test models (e.g. performance test models with huge number
of elements, models with errors, models that provide more coverage, etc.).

Regards,


Horacio Hoyos Rodríguez
EngD Student
University of York

http://www.york.ac.uk/docs/disclaimer/email.htm


-----Original Message-----
From: qvtd-dev-bounces@xxxxxxxxxxx [mailto:qvtd-dev-bounces@xxxxxxxxxxx]
On Behalf Of Adolfo Sanchez-Barbudo Herrera
Sent: 18 February 2015 19:21
To: qvtd-dev@xxxxxxxxxxx
Subject: Re: [qvtd-dev] Branch merging

Hi ,

Done.

QVTd test cases don't pass. They were messed up again in hhoyos/mtc[1] ;P.
Actually, I still see both
org.eclipse.qvtd.xtext.qvtimperative.tests.ClassToRDBMS and
org.eclipse.qvtd.xtext.qvtimperative.tests.UMLToRDBMS confusing packages.
I presume just one of them should remain.

I prefer to leave that final fix to Horacio because he knows what exactly
should remain there.

Feel free to fix it on top of your branch (hhoyos/mtc). I'll rebase again
tomorrow.

[1] commit a26be828f55cb07aa0787e6d3778d4fcc220b4fa

Regards,
Adolfo.
On 18/02/2015 18:15, Adolfo Sanchez-Barbudo Herrera wrote:
Hi,

I'll rebase my recent stuff on top horacio's one (hhoyos/mtc). This
will include additional commit with Unix line-ending review and such.

Regards,
Adolfo.

On 18/02/2015 18:10, Horacio Hoyos Rodriguez wrote:
Hi,

I have merged both asanchez and hhoyos latest development into
hhoyos/mtc, which also has merged from master and have fixed line
endings on all files in that merge. You should be able to merge it
into master.

Regards,

On 18 February 2015 at 16:55, Ed Willink <ed@xxxxxxxxxxxxx
<mailto:ed@xxxxxxxxxxxxx>> wrote:

     Hi

     I've been trying to tidy up the current branch anarchy so that we
     have a sensible master that incorporates all the good work, but:

     It seems we already have
     - many bad rebases - inconsistent usage of OCL plugins
     - some bad merges - syntax errors from merge annotations
     - some bad files - inconsistent Unix/Windows characteristics

     Tidying up is not a trivial job and while it may make the history
     look tidier it may actually just add a further layer of obfuscation
     for anyone who really wants to understand the anarchic history.

     So I give up.

     Please merge all active asanchez and hhoyos branches to provide a
     single branch that I can merge with master.

     In the future please ensure that wherever possible ongoing work is
     rebased on, or merged from, the most recent unifying master merge
of
     new work. Please avoid continuing work from stale commits.

     Please ensure that all projects have explicit Unix, UTF-8
     characteristics. Please ensure that all non-binary files are
     converted to Unix/UTF-8 before committing. Unfortunately some model
     tools do not get this right. If Windows files are accidentally
     committed, please rework the offending commits.

     If a bad merge is detected, please rework to correct the bad merge
     at the merge; not four commits later.

          Regards

              Ed Willink
     _________________________________________________
     qvtd-dev mailing list
     qvtd-dev@xxxxxxxxxxx <mailto:qvtd-dev@xxxxxxxxxxx>
     To change your delivery options, retrieve your password, or
     unsubscribe from this list, visit
     https://dev.eclipse.org/__mailman/listinfo/qvtd-dev
     <https://dev.eclipse.org/mailman/listinfo/qvtd-dev>




--

Horacio Hoyos Rodríguez
EngD Student
University of York


Email Disclaimer:
http://www.york.ac.uk/docs/__disclaimer/email.htm
<http://www.york.ac.uk/docs/disclaimer/email.htm>


_______________________________________________
qvtd-dev mailing list
qvtd-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or
unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/qvtd-dev

_______________________________________________
qvtd-dev mailing list
qvtd-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe
from this list, visit https://dev.eclipse.org/mailman/listinfo/qvtd-dev
_______________________________________________
qvtd-dev mailing list
qvtd-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/qvtd-dev

-----
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2015.0.5646 / Virus Database: 4284/9143 - Release Date: 02/19/15



Back to the top