Merge branch 'developer'

Author: abainczyk

.gitignore

@@ -13,7 +13,7 @@ backend/logs
 cli/src/main/javascript/node_modules
 frontend/src/main/javascript/node_modules
 frontend/src/main/javascript/dist
-frontend/src/main/javascript/tests/coverage
+frontend/src/main/javascript/test/coverage
 frontend/src/main/javascript/assets/fonts
 
 # Auto Generated Swagger Doc
@@ -22,3 +22,5 @@ main/src/main/webapp/restdocs
 main/uploads
 
 frontend/src/main/javascript/npm-debug\.log
+
+backend/debug.log

.travis.yml

@@ -0,0 +1,35 @@
+language: java
+
+dist: trusty
+sudo: false
+
+jdk:
+  - oraclejdk8
+  - openjdk8
+
+addons:
+  apt:
+    sources:
+      - sourceline: "deb https://deb.nodesource.com/node_10.x trusty main"
+        key_url:    "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
+    packages:
+      - nodejs
+
+cache:
+  directories:
+  - $HOME/.m2
+  - frontend/src/main/javascript/node_modules
+
+before_cache:
+  # do not cache our local archives
+  - rm -rf $HOME/.m2/repository/de/learnlib/alex/
+
+install: true # skip mvn install, because we essentially run the same command in the script routine
+
+script:
+  - mvn clean package
+
+branches:
+  only:
+  - master
+  - developer

CHANGELOG.md

@@ -1,3 +1,55 @@
+# ALEX 1.5.0
+
+## Breaking Changes
+
+* Symbols and tests that have been exported with v.1.4.0 and lower can not be imported directly.
+  Apply the new export format and for each symbol in an exported JSON file add the properties `inputs` and `outputs` so that the resulting file looks like:
+    
+  ```JSON
+  {
+    "version": "1.4.0",
+    "type": "symbols",
+    "symbols": [
+      {
+        "name": "symbol",
+        ...,
+        "inputs": [],
+        "outputs": []
+      },
+      ...
+    ]
+  }
+  ```
+
+## Bug Fixes
+
+* Resuming a learning process should now work as expected.
+* Various smaller fixes.
+
+## Features
+
+* The results of test executions are saved in reports.
+* Added webhooks to notify external applications about changes.
+* Reuse the browser instance for membership queries. 
+  A hard reset with a new browser instance can be achieved with a new action.
+* New actions: 
+    * Refresh and restart the browser window.
+    * Click on a arbitrary element with a given visible text.
+    * Check if an element, e.g. a checkbox, radio button or option is selected.
+    * Set variable to HTTP response body.
+* Parameterized symbols: symbols now have dynamic inputs and outputs.
+  Values for inputs can be set by a user for modelling tests.
+* Symbols and symbol groups can be nested in a tree like structure.
+* Named project URLs.
+* Download uploaded files.
+* Learner results can be cloned.
+* Import and export symbol groups.
+
+## Further Comments
+
+* The CLI for ALEX is now a standalone NPM package and can be installed via `npm install alex-cli`
+
+
 # ALEX 1.4.0
 
 ## Breaking Changes
@@ -101,4 +153,4 @@ See the [user documentation](http://learnlib.github.io/alex/book/1.4.0/) for mor
 ## Other
 
 * Updated frontend and backend dependencies
-* Removed requirement to have grunt and grunt-cli installed globally
+* Removed requirement to have grunt and grunt-cli installed globally

LICENSE.txt

@@ -176,7 +176,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 END OF TERMS AND CONDITIONS
 
-Copyright 2016 TU Dortmund
+Copyright 2018 TU Dortmund
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -188,4 +188,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

README.md

@@ -4,62 +4,61 @@
 
 # ALEX
 
-Automata Learning Experience (ALEX) is an extension of the [LearnLib](https://github.com/LearnLib/learnlib) that allows 
-you run automated tests on web applications and JSON-based REST APIs using active automata learning.
+[![Travis CI](https://travis-ci.org/LearnLib/alex.svg?branch=developer)](https://travis-ci.org/LearnLib/alex)
 
-Users model basic test inputs for their target application which are used by ALEX to automatically infer an automaton 
-model, or to be more precise, a [Mealy machine](https://en.wikipedia.org/wiki/Mealy_machine) that represents the 
-behavior of the web application.
+Automata Learning EXperience (ALEX) is an extension of [LearnLib][learnlib] that allows you run automated tests on web 
+applications and JSON-based REST APIs using active automata learning.
 
-## Installation and login
+Users model [Selenium][selenium]- or HTTP-based test inputs for their application, which are used to automatically infer 
+an automaton model (a [Mealy machine][mealy]), which represents the behavior of the web application.
 
-We developed and tested ALEX using either Windows 8.1 and higher and Linux Ubuntu 14.10 and higher.
-As the application runs on JAVA, any other system with an installed JVM should do fine.
-We also advise to use a modern web browser like Google Chrome, Mozilla Firefox or Microsoft Edge with JavaScript enabled.
+## Installation
 
-After the first start, you can login as an admin using the account below.
-
-Email: *admin@alex.example* <br>
-Password: *admin*
+Make sure you have Java 8 installed on your system.
+We advise to use a modern web browser like Google Chrome, Mozilla Firefox or Microsoft Edge with JavaScript enabled.
 
-#### Using the packaged version
+1. [Download](https://github.com/LearnLib/alex/releases/latest) the latest version.
+2. Open a terminal and start ALEX via `java -jar alex-1.5.0.war [--alex.port=XXXX]`.
+3. Wait until the command line prints something like `de.learnlib.alex.App - Started App in XX.XXX seconds`.
+3. Open *http://localhost:8000* in a web browser.
 
-Make sure you have Java 8 installed on your system.
+After the first start, you can login as an admin using the account below:
 
-1. Download the latest version. [Download](https://github.com/LearnLib/alex/releases/latest)
-2. Open a terminal and start the *war* archive using `java -jar ALEX.war [--port=XXXX]`
-3. Open *http://localhost:8000* in a web browser
+Email: *admin@alex.example* <br>
+Password: *admin*
 
-#### From source
+## Build instructions
 
-For the installation from the source files make sure your system matches the following requirements:
+In order to build ALEX from source make sure your system matches the following requirements:
 
 * Java JDK 8
 * Maven 3
-* Node.js v7.9.* and the NPM
-
-To obtain ALEX execute the following commands in a directory of your choice:
-
-1. `git clone https://github.com/LearnLib/alex.git`
-2. `cd alex`
+* Node.js (v10.0.0) and the NPM (v6.0.0)
 
-Afterwards you can build and run ALEX by running following commands:
+To build ALEX, open a terminal and follow the instructions below:
 
-1. `mvn clean package [-DskipTests]`
-2. `java -jar build/target/ALEX/*war [--alex.port=XXXX]`
-3. open *http://localhost:8000* in a web browser
+```bash
+# clone the repository
+git clone https://github.com/LearnLib/alex.git
 
-Or, if you just want to start the backend, you can use:
+# navigate to the project directory
+cd alex
 
-1. `cd main`
-2. `mvn spring-boot:run [-Dalex.port=XXXX]`
-3. open *http://localhost:8000* in a web browser
+# build ALEX
+mvn install package [-DskipTests]
+```
 
+The bundle can then be found at `build/target/alex-build-1.5.0.war`.
 
 ## Further reading
 
-* [User manual](http://learnlib.github.io/alex/book/1.4.0/contents/user-manual/index.html)
-* [Examples](http://learnlib.github.io/alex/book/1.4.0/contents/examples/index.html)
-* [Developer docs](http://learnlib.github.io/alex/book/1.4.0/contents/developer-documents/index.html)
+* [User manual](http://learnlib.github.io/alex/book/1.5.0/contents/user-manual/index.html)
+* [Examples](http://learnlib.github.io/alex/book/1.5.0/contents/examples/index.html)
+* [Developer docs](http://learnlib.github.io/alex/book/1.5.0/contents/developer-documents/index.html)
 * [Active automata learning](https://scholar.google.de/scholar?hl=de&q=active+automata+learning)
 * [LearnLib](http://learnlib.de/)
+
+
+[learnlib]: https://github.com/LearnLib/learnlib
+[mealy]: https://en.wikipedia.org/wiki/Mealy_machine
+[selenium]: https://www.seleniumhq.org/

backend/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2017 TU Dortmund
+  ~ Copyright 2018 TU Dortmund
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>de.learnlib.alex</groupId>
         <artifactId>alex-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -44,17 +44,17 @@
         <spring.version>4.3.12.RELEASE</spring.version>
         <log4j.version>2.6.2</log4j.version>
         <jersey.version>2.25.1</jersey.version>
-        <learnlib.version>0.12.1-SNAPSHOT</learnlib.version>
-        <automatalib.version>0.6.1-SNAPSHOT</automatalib.version>
-        <selenium.version>3.7.1</selenium.version>
+        <learnlib.version>0.13.1</learnlib.version>
+        <automatalib.version>0.7.1</automatalib.version>
+        <selenium.version>3.11.0</selenium.version>
         <htmlunitdriver.version>2.28.2</htmlunitdriver.version>
         <jose4j.version>0.6.2</jose4j.version>
         <shiro.version>1.4.0</shiro.version>
         <xml-apis.version>1.4.01</xml-apis.version>
         <jsoup.version>1.11.2</jsoup.version>
         <json-path.version>2.4.0</json-path.version>
         <hsqldb.version>2.4.0</hsqldb.version>
-        <jackson-datatype.version>2.9.2</jackson-datatype.version>
+        <jackson-datatype.version>2.9.4</jackson-datatype.version>
         <junit.version>4.12</junit.version>
         <mockito.version>2.12.0</mockito.version>
         <powermock.version>1.7.3</powermock.version>
@@ -255,11 +255,6 @@
             <artifactId>htmlunit-driver</artifactId>
             <version>${htmlunitdriver.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-support</artifactId>
-            <version>${selenium.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-chrome-driver</artifactId>

backend/src/main/java/de/learnlib/alex/ALEXApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 TU Dortmund
+ * Copyright 2018 TU Dortmund
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,22 +23,26 @@
 import de.learnlib.alex.auth.security.AuthenticationFilter;
 import de.learnlib.alex.common.exceptions.NotFoundExceptionMapper;
 import de.learnlib.alex.config.dao.SettingsDAO;
+import de.learnlib.alex.config.entities.DriverSettings;
 import de.learnlib.alex.config.entities.Settings;
 import de.learnlib.alex.config.rest.SettingsResource;
 import de.learnlib.alex.data.rest.CounterResource;
 import de.learnlib.alex.data.rest.FileResource;
 import de.learnlib.alex.data.rest.ProjectResource;
 import de.learnlib.alex.data.rest.SymbolGroupResource;
+import de.learnlib.alex.data.rest.SymbolParameterResource;
 import de.learnlib.alex.data.rest.SymbolResource;
 import de.learnlib.alex.learning.rest.LearnerResource;
 import de.learnlib.alex.learning.rest.LearnerResultResource;
-import de.learnlib.alex.testsuites.rest.TestResource;
+import de.learnlib.alex.testing.rest.TestExecutionConfigResource;
+import de.learnlib.alex.testing.rest.TestReportResource;
+import de.learnlib.alex.testing.rest.TestResource;
+import de.learnlib.alex.webhooks.rest.WebhookResource;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.web.cors.CorsConfiguration;
@@ -96,10 +100,14 @@ public ALEXApplication() {
         register(LearnerResultResource.class);
         register(ProjectResource.class);
         register(SettingsResource.class);
-        register(SymbolGroupResource.class);
         register(SymbolResource.class);
+        register(SymbolGroupResource.class);
+        register(SymbolParameterResource.class);
         register(UserResource.class);
         register(TestResource.class);
+        register(TestReportResource.class);
+        register(WebhookResource.class);
+        register(TestExecutionConfigResource.class);
 
         // Exceptions
         register(NotFoundExceptionMapper.class);
@@ -142,7 +150,7 @@ public void initSettings() {
                 String edgeDriverPath = System.getProperty("webdriver.edge.driver", "");
                 String remoteDriverURL = System.getProperty("webdriver.remote.url", "");
 
-                final Settings.DriverSettings driverSettings = new Settings.DriverSettings(chromeDriverPath,
+                final DriverSettings driverSettings = new DriverSettings(chromeDriverPath,
                                                                                            geckoDriverPath,
                                                                                            edgeDriverPath,
                                                                                            remoteDriverURL);

backend/src/main/java/de/learnlib/alex/App.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 TU Dortmund
+ * Copyright 2018 TU Dortmund
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

backend/src/main/java/de/learnlib/alex/JacksonConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 TU Dortmund
+ * Copyright 2018 TU Dortmund
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

backend/src/main/java/de/learnlib/alex/auth/dao/UserDAO.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 TU Dortmund
+ * Copyright 2018 TU Dortmund
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.