Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes 984 and 992 #1006

Merged
merged 8 commits into from Feb 27, 2017
Merged

Fixes 984 and 992 #1006

merged 8 commits into from Feb 27, 2017

Conversation

AdamBJ
Copy link
Contributor

@AdamBJ AdamBJ commented Feb 27, 2017

See #993 (comment) for what this PR does. I'm making a new PR rather than using 993 because I rebased in a dumb way and messed up the commit history of the 984 branch.

…utput files to go unreported. This bug has led to approximately 15 empty expected outputs files being included in the test suites.

- Ran Umple for each of the empty test files and recorded the output in the appropriate empty expected output file (this have not been carefully checked, I'll be looking for help from more experienced contributor on this)
- Removed one test file, ExampleFile.ump. This test case was exactly the same as the test case directly below it in AlloyTemplateTest.java
- A static variable controlling the numbering of auto transitions was being carried over from test to test and producing variable outputs in StateMachineTest.java. Added code in StateMachineTest.java to clear the state of the Event object after each test.
…face doesn't explicitly include the interface's methods in its generated code.
…tempting to fix travis build failure by seperating tests in JavaInterfaceTemplateTest.java.
…re interface hierarchy. Adding additional tests to verify the fix.
@vahdat-ab vahdat-ab merged commit f40fd9b into umple:master Feb 27, 2017
@AdamBJ
Copy link
Contributor Author

AdamBJ commented Feb 27, 2017 via email

@AdamBJ
Copy link
Contributor Author

AdamBJ commented Feb 27, 2017

@vahdat-ab I did another full build locally, there aren't any errors. Here's the build output:
https://gist.github.com/AdamBJ/faac94caa040a1e412dbe43f93d8466d

I'm not sure what's wrong. I didn't have any problems locally, and the build completed on Linux successfully. Is there any way to run the CI again? Maybe it's just "one of those things"?

@AdamBJ
Copy link
Contributor Author

AdamBJ commented Feb 27, 2017

I can't rerun the travis build for this since the PR has been merged... I'll try to figure out another way

@AdamBJ
Copy link
Contributor Author

AdamBJ commented Feb 27, 2017

It looks like the travis checks on master with my changes included are fine: https://travis-ci.org/umple/umple/builds/205684014

@vahdat-ab
Copy link
Member

@AdamBJ everything looks ok :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants