diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
new file mode 100755
index 0000000..25e8407
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2020 Muzikář Martin
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
diff --git a/README.md b/README.md
new file mode 100755
index 0000000..2201dce
--- /dev/null
+++ b/README.md
@@ -0,0 +1,21 @@
+# Interactive testing code contents
+As you can read in the thesis this application is made of 3 components Agent, Test suite and Frontend. These respective components are placed in their respective folders:
+ * backendprovider - *agent*
+ * testsuite - *test suite*
+ * ui - *frontend*
+
+# Requirements
+For running the test suite JDK version 8 and maven are required. Other than that maven should fetch all of its dependencies. As for the UI part npm needs to be installed and `npm install` should suffice.
+
+
+## Starting the application
+Running the application requires running the test suite which is modified by the agent and opening the UI in the browser.
+### Development version
+The test suite is started by running command `mvn clean install` in the root directory which compiles the agent and starts the test suite using the agent. If changes are made to the code of either test suite or agent run `mvn clean test` again to compile and restart the backend.
+
+For running the development version of the Frontend change directory to the `ui` folder and run `npm start` (`npm install` might be needed to fetch the dependencies first). Changes to the code should be recompiled and the browser window should refresh when the compilation is done. If creating a release build (making a portable version without development dependencies) `npm build` will produce a `dist` folder where the compiled files can be found.
+
+### Bundled version
+The test suite backend still needs to be run by running `mvn clean install` in the root directory.
+
+The built version of the fronted can be found in directory `frontend` where the `index.html` file can be just opened in a browser.
diff --git a/backendprovider/.classpath b/backendprovider/.classpath
old mode 100644
new mode 100755
diff --git a/backendprovider/.factorypath b/backendprovider/.factorypath
old mode 100644
new mode 100755
diff --git a/backendprovider/.project b/backendprovider/.project
old mode 100644
new mode 100755
diff --git a/backendprovider/backendprovider.iml b/backendprovider/backendprovider.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/backendprovider/backendprovider.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/backendprovider/dependency-reduced-pom.xml b/backendprovider/dependency-reduced-pom.xml
old mode 100644
new mode 100755
diff --git a/backendprovider/pom.xml b/backendprovider/pom.xml
old mode 100644
new mode 100755
index ee09513..b99e6df
--- a/backendprovider/pom.xml
+++ b/backendprovider/pom.xml
@@ -21,6 +21,13 @@
+
+ UTF-8
+ 1.10.1
+ 1.18.6
+ bytebuddy
+ 6.2.2
+
@@ -44,21 +51,6 @@
RELEASEprovided
-
- io.cucumber
- cucumber-java
- 2.3.1
-
-
- io.cucumber
- cucumber-junit
- 2.3.1
-
-
- junit
- junit
- 4.12
- commons-io
@@ -67,11 +59,27 @@
- com.github.Col-E
- Simple-Memory-Compiler
- 2.2
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.1.0
+ test
+
+
+ org.assertj
+ assertj-core
+ 3.16.1
+ test
+
+
+ com.google.code.gson
+ gson
+ 2.8.2
+ compile
+
+
+
@@ -166,10 +174,4 @@
-
- UTF-8
- 1.10.1
- 1.18.6
- bytebuddy
-
diff --git a/backendprovider/src/main/java/mmuzikar/AgentConfiguration.java b/backendprovider/src/main/java/mmuzikar/AgentConfiguration.java
old mode 100644
new mode 100755
index 2695b8a..6ce9641
--- a/backendprovider/src/main/java/mmuzikar/AgentConfiguration.java
+++ b/backendprovider/src/main/java/mmuzikar/AgentConfiguration.java
@@ -1,15 +1,17 @@
package mmuzikar;
+//Configuration class
public class AgentConfiguration {
private static final String BACKEND_PORT_TCP = "backend.port.tcp";
private static final String BACKEND_PORT_UDP = "backend.port.udp";
-
+ //used for the http server
public static int getUsedTCPPort(){
return (int) System.getProperties().getOrDefault(BACKEND_PORT_TCP, 28319);
}
+ //UDP port is not used
public static int getUsedUDPPort(){
return (int) System.getProperties().getOrDefault(BACKEND_PORT_UDP, getUsedTCPPort() + 1);
}
diff --git a/backendprovider/src/main/java/mmuzikar/AgentMain.java b/backendprovider/src/main/java/mmuzikar/AgentMain.java
old mode 100644
new mode 100755
index af4b4b2..e5369e6
--- a/backendprovider/src/main/java/mmuzikar/AgentMain.java
+++ b/backendprovider/src/main/java/mmuzikar/AgentMain.java
@@ -4,7 +4,8 @@
public class AgentMain {
- public static void premain(String args, Instrumentation instrumentation){
+ //Agent entry-point
+ public static void premain(String args, Instrumentation instrumentation) {
ByteBuddyHandler agent = new ByteBuddyHandler();
agent.handleArguments(args);
agent.registerTransformations(instrumentation);
diff --git a/backendprovider/src/main/java/mmuzikar/ByteBuddyHandler.java b/backendprovider/src/main/java/mmuzikar/ByteBuddyHandler.java
old mode 100644
new mode 100755
index a440fca..5f7c5a7
--- a/backendprovider/src/main/java/mmuzikar/ByteBuddyHandler.java
+++ b/backendprovider/src/main/java/mmuzikar/ByteBuddyHandler.java
@@ -2,6 +2,9 @@
import lombok.extern.java.Log;
import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.implementation.MethodCall;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import mmuzikar.interceptors.CucumberInterceptor;
@@ -18,28 +21,20 @@ public void handleArguments(String args){
public void registerTransformations(Instrumentation instrumentation) {
log.info("AGENT INSTALLED");
- /*
- new AgentBuilder.Default()
-// .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
- .type(ElementMatchers.named("mmuzikar.TestObject"))
- .transform((builder, typeDescription, classLoader, module) ->
- builder.method(ElementMatchers.isToString())
- .intercept(MethodDelegation.to(TestInterceptor.class))
- .defineField("injectedField", Object.class, Modifier.PUBLIC | Modifier.STATIC)
- ).installOn(instrumentation);
-
- */
+ //Instruct childrenInvoker method to call one from CucumberInterceptor instead
new AgentBuilder.Default()
.with(AgentBuilder.TypeStrategy.Default.REDEFINE)
.with(AgentBuilder.InjectionStrategy.UsingReflection.INSTANCE)
- //.with(AgentBuilder.Listener.StreamWriting.toSystemError())
- .type(ElementMatchers.named("cucumber.api.junit.Cucumber"))
+ .with(AgentBuilder.Listener.StreamWriting.toSystemError().withErrorsOnly())
+ .type(ElementMatchers.named("cucumber.api.junit.Cucumber").or(ElementMatchers.named("io.cucumber.junit.Cucumber")))
.transform((builder, typeDescription, classLoader, module) -> {
log.info("Transforming: " + typeDescription.getName());
return builder.method(ElementMatchers.named("childrenInvoker"))
- .intercept(MethodDelegation.to(CucumberInterceptor.class));
+ .intercept(MethodDelegation.to(CucumberInterceptor.class))
+ .visit(Advice.to(CucumberInterceptor.class).on(ElementMatchers.isConstructor()));
}).installOn(instrumentation);
-/*
+ //Leftover Expose tries
+ /*
new AgentBuilder.Default()
.with(AgentBuilder.TypeStrategy.Default.REDEFINE)
.with(AgentBuilder.InjectionStrategy.UsingReflection.INSTANCE)
@@ -62,7 +57,7 @@ public void registerTransformations(Instrumentation instrumentation) {
return builder.constructor(ElementMatchers.any())
.intercept(MethodDelegation.to(ExposeInterceptor.class));
}).installOn(instrumentation);
-*/
+ */
}
}
diff --git a/backendprovider/src/main/java/mmuzikar/IAgent.java b/backendprovider/src/main/java/mmuzikar/IAgent.java
deleted file mode 100644
index bee8169..0000000
--- a/backendprovider/src/main/java/mmuzikar/IAgent.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package mmuzikar;
-
-import java.lang.instrument.Instrumentation;
-
-public interface IAgent {
-
- default void handleArguments(String args) {/*NOOP*/}
- void registerTransformations(Instrumentation instrumentation);
-
-
-}
diff --git a/backendprovider/src/main/java/mmuzikar/api/Expose.java b/backendprovider/src/main/java/mmuzikar/api/Expose.java
old mode 100644
new mode 100755
index e17d41a..b177683
--- a/backendprovider/src/main/java/mmuzikar/api/Expose.java
+++ b/backendprovider/src/main/java/mmuzikar/api/Expose.java
@@ -7,6 +7,12 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ Expose annotation was meant to be used as a way to providing
+ interoperability between the UI and the Java test suite.
+ It proved to be more difficult, see ExposeInterceptor for annotation processor skeleton
+ in ExposeProcessor all exposed instances (be it objects, methods etc.) would reside.
+*/
@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Expose {
diff --git a/backendprovider/src/main/java/mmuzikar/api/IExposedNameProvider.java b/backendprovider/src/main/java/mmuzikar/api/IExposedNameProvider.java
old mode 100644
new mode 100755
index a3914f7..2fa1913
--- a/backendprovider/src/main/java/mmuzikar/api/IExposedNameProvider.java
+++ b/backendprovider/src/main/java/mmuzikar/api/IExposedNameProvider.java
@@ -1,5 +1,9 @@
package mmuzikar.api;
+/**
+ * Provides a name for object to be exposed
+ * @param Object type to be exposed
+ */
public interface IExposedNameProvider {
String getNameFor(T obj);
diff --git a/backendprovider/src/main/java/mmuzikar/api/ISuggestionProvider.java b/backendprovider/src/main/java/mmuzikar/api/ISuggestionProvider.java
old mode 100644
new mode 100755
index b9d8901..fbc6ac9
--- a/backendprovider/src/main/java/mmuzikar/api/ISuggestionProvider.java
+++ b/backendprovider/src/main/java/mmuzikar/api/ISuggestionProvider.java
@@ -4,9 +4,9 @@
public interface ISuggestionProvider {
- List