Skip to content

Commit 44c3edb

Browse files
committed
Merge branch 'developer'
2 parents f23f68b + 7d12613 commit 44c3edb

File tree

1,438 files changed

+37193
-51639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,438 files changed

+37193
-51639
lines changed

.gitignore

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,24 @@ main/logs
77
target
88
*.class
99
hs_err_pid*
10+
11+
# log files
1012
backend/logs
13+
backend/debug.log
1114

1215
# JavaScript
1316
cli/src/main/javascript/node_modules
1417
frontend/src/main/javascript/node_modules
1518
frontend/src/main/javascript/dist
1619
frontend/src/main/javascript/test/coverage
17-
frontend/src/main/javascript/assets/fonts
18-
19-
# Auto Generated Swagger Doc
20-
main/src/main/webapp/restdocs
21-
22-
main/uploads
23-
2420
frontend/src/main/javascript/npm-debug\.log
2521
frontend/src/main/javascript/package-lock\.json
22+
frontend/src/main/javascript/dist
2623

27-
backend/debug.log
24+
# uploaded files
25+
main/uploads
26+
27+
# genereated user documentation
28+
documentation/src/main/docs/.vuepress/dist
29+
documentation/src/main/docs/node_modules
30+
documentation/src/main/docs/package-lock\.json

.travis.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
language: java
22

33
dist: trusty
4-
sudo: false
5-
6-
jdk:
7-
- oraclejdk8
8-
- openjdk8
4+
sudo: true
95

106
addons:
117
apt:
@@ -14,6 +10,7 @@ addons:
1410
key_url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
1511
packages:
1612
- nodejs
13+
- chromium-chromedriver
1714

1815
cache:
1916
directories:
@@ -24,12 +21,26 @@ before_cache:
2421
# do not cache our local archives
2522
- rm -rf $HOME/.m2/repository/de/learnlib/alex/
2623

27-
install: true # skip mvn install, because we essentially run the same command in the script routine
24+
install:
25+
# override any "sane" defaults of Travis VMs
26+
- cp ${TRAVIS_BUILD_DIR}/.travis/settings.xml ${HOME}/.m2/settings.xml
2827

2928
script:
30-
- mvn clean package -Pbootstrap
29+
- mvn clean install -Pbootstrap,code-analysis,documentation,integration-tests
3130

3231
branches:
3332
only:
3433
- master
3534
- developer
35+
36+
jobs:
37+
include:
38+
- jdk: openjdk8
39+
- jdk: openjdk11
40+
- jdk: oraclejdk8
41+
- jdk: oraclejdk11
42+
- stage: "Coverage"
43+
jdk: openjdk8
44+
script:
45+
- mvn install -Pbootstrap,code-analysis,integration-tests # code-analysis currently includes JaCoCo
46+
- mvn coveralls:report

.travis/settings.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
4+
5+
<!-- A minimalistic settings XML that does NOT set the Apache Snapshot Repository (which always times out) -->
6+
7+
<interactiveMode>false</interactiveMode>
8+
9+
</settings>

CHANGELOG.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,53 @@
1+
# ALEX 1.7.0
2+
3+
## Breaking Changes
4+
5+
* Removed the HTML Element Picker.
6+
The picker only really worked in Chrome and then only in some selected use cases, i.e. static pages.
7+
Due to these restrictions we decided to remove it completely.
8+
* Removed xvfb option.
9+
The option was introduced when major browsers did not have a headless mode.
10+
Since the option only worked on Linux systems and all major browsers have such a mode, the option has been removed.
11+
12+
## Features
13+
14+
* Basic LTL-based model checking using [LTSmin](https://ltsmin.utwente.nl/).
15+
* Compatibility with Java > 8.
16+
* Add action to set a variable by HTTP status.
17+
* Improved parallelisation support for learning processes.
18+
* Permanently delete symbols instead of just hiding them.
19+
This only works if a symbol is not referenced by some other entity.
20+
* Symbol groups can have the same name when they don't share the parent group.
21+
* New events for when symbols are deleted permanently.
22+
* New model checker related events.
23+
* The JWT expires after 7 days.
24+
25+
## Fixes
26+
27+
* Test results are ordered properly.
28+
* Fix resuming learning processes with new input symbols.
29+
30+
131
# ALEX 1.6.1
232

333
## Fixes
434

535
* Fix issues with HTML Element Picker
636

37+
738
# ALEX 1.6.0
839

940
## Breaking Changes
1041

1142
* Symbols have to be migrated to the new version.
1243
Please use the migration script `src/main/resources/migration/1.6.0/migrate-symbols-1.5.0-to-1.6.0.js` via:
1344

14-
`node migrate-symbols-1.5.0-to-1.6.0.js -i ./symbols-from-1.5.0.json -o ./symbols-for-1.6.0.json`
45+
`node migrate-symbols-1.5.0-to-1.6.0.js ./symbols-from-1.5.0.json ./symbols-for-1.6.0.json`
1546

1647
* Tests have to be migrated to the new version.
1748
Please use the migration script `src/main/resources/migration/1.6.0/migrate-tests-1.5.0-to-1.6.0.js` via:
1849

19-
`node migrate-tests-1.5.0-to-1.6.0.js -i ./tests-from-1.5.0.json -o ./tests-for-1.6.0.json`
50+
`node migrate-tests-1.5.0-to-1.6.0.js ./tests-from-1.5.0.json ./tests-for-1.6.0.json`
2051

2152
## Features
2253

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
176176

177177
END OF TERMS AND CONDITIONS
178178

179-
Copyright 2018 TU Dortmund
179+
Copyright 2015 - 2019 TU Dortmund
180180

181181
Licensed under the Apache License, Version 2.0 (the "License");
182182
you may not use this file except in compliance with the License.

README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# ALEX
66

77
[![Travis CI](https://travis-ci.org/LearnLib/alex.svg?branch=developer)](https://travis-ci.org/LearnLib/alex)
8+
[![Coverage Status](https://coveralls.io/repos/github/LearnLib/alex/badge.svg?branch=developer)](https://coveralls.io/github/LearnLib/alex?branch=master)
89

910
Automata Learning EXperience (ALEX) is an extension of [LearnLib][learnlib] that allows you run automated tests on web
1011
applications and JSON-based REST APIs using active automata learning.
@@ -18,7 +19,7 @@ Make sure you have Java 8 installed on your system.
1819
We advise to use a modern web browser like Google Chrome, Mozilla Firefox or Microsoft Edge with JavaScript enabled.
1920

2021
1. [Download](https://github.com/LearnLib/alex/releases/latest) the latest version.
21-
2. Open a terminal and start ALEX via `java -jar alex-1.6.1.war [--server.port=XXXX]`.
22+
2. Open a terminal and start ALEX via `java -jar alex-1.7.0-SNAPSHOT.war [--server.port=XXXX]`.
2223
3. Wait until the command line prints something like `de.learnlib.alex.App - Started App in XX.XXX seconds`.
2324
3. Open *http://localhost:8000* in a web browser.
2425

@@ -48,7 +49,7 @@ cd alex
4849
mvn install package [-DskipTests]
4950
```
5051

51-
The bundle can then be found at `build/target/alex-build-1.6.1.war`.
52+
The bundle can then be found at `build/target/alex-build-1.7.0-SNAPSHOT.war`.
5253

5354
## Connecting to a database
5455

@@ -70,7 +71,19 @@ spring.jpa.hibernate.ddl-auto=update
7071

7172
Then, start ALEX like this:
7273

73-
`java -jar alex-1.6.1.war "--spring.config.location=/path/to/your/application.properties"`
74+
`java -jar alex-buid-1.7.0-SNAPSHOT.war "--spring.config.location=/path/to/your/application.properties"`
75+
76+
77+
## Using LTSMin
78+
79+
ALEX uses the external [LTSMin][ltsmin] library for model checking.
80+
If you want to use its capabilities, download version **3.0.2** and append the `ltsmin.path` argument to the ALEX binary on start.
81+
The value for the argument should be the *bin* directory where the compiled binaries of LTSMin are located.
82+
Example:
83+
84+
`java -jar alex-1.7.0.war --ltsmin.path="/path/to/ltsmin/bin"`
85+
86+
7487

7588
## Further reading
7689

@@ -84,3 +97,4 @@ Then, start ALEX like this:
8497
[learnlib]: https://github.com/LearnLib/learnlib
8598
[mealy]: https://en.wikipedia.org/wiki/Mealy_machine
8699
[selenium]: https://www.seleniumhq.org/
100+
[ltsmin]: http://ltsmin.utwente.nl/

0 commit comments

Comments
 (0)