Fix #964 #980

Merged
merged 4 commits into from Feb 3, 2017

Projects

None yet

2 participants

@nwam
Contributor
nwam commented Jan 28, 2017

Description

This fixes issue #964.

Tests

Several test templates have been slightly modified such that the method parameters are actual valid PHP method parameters. An additional test has been created to cover every type of method parameter.

Closes #964

nwam added some commits Jan 23, 2017
@nwam nwam Issue solved, but test cases are needed 33a3af1
@nwam nwam fixed broken tests e2db9b5
@nwam nwam created a test for #964
957b0ef
@@ -1,6 +1,6 @@
<?php
/*PLEASE DO NOT EDIT THIS CODE*/
-/*This code was generated using the UMPLE @UMPLE_VERSION@ modeling language!*/
+/*This code was generated using the UMPLE 1.25.0-963d2bd modeling language!*/
@vahdat-ab
vahdat-ab Jan 28, 2017 edited Member

You don't need to specify the version. Please follow other test cases. We never put the version in our test cases.
This is applied to all others you have changed.

@nwam
nwam Jan 29, 2017 edited Contributor

I generated this code via my build at /dist/umple-*.jar. Is there another way in which I should be creating the *.txt test files? Or should I just change that comment in the generated files?

@vahdat-ab
vahdat-ab Jan 30, 2017 Member

If you keep the following line, it should works.
This is what you can see in all test cases.

/*PLEASE DO NOT EDIT THIS CODE*/
/*This code was generated using the UMPLE @UMPLE_VERSION@ modeling language!*/

The rest should be adjusted.

@nwam nwam changed comment in tests to match all other tests
3caf8ed
@vahdat-ab
Member

Thanks.

@vahdat-ab vahdat-ab merged commit 61a14ab into umple:master Feb 3, 2017

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment