Merge branch 'master' into feature/cql-query-parser

Author: gonzalotguerrero

.github/workflows/ci.yml

@@ -405,6 +405,47 @@ jobs:
           CI_env: GithubAction
 
 
+  python-bb-e2e:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    needs: setup
+    if: needs.setup.outputs.debug == 'false'
+    steps:
+      - uses: actions/checkout@v6
+      - name: Setup JDK ${{env.build-jdk}}
+        uses: actions/setup-java@v5
+        with:
+          distribution: ${{env.java-distribution}}
+          java-version: ${{env.build-jdk}}
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.10'
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Cache Maven packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build with Maven
+        run: mvn clean install -DskipTests
+        env:
+          CI_env: GithubAction
+      - name: Run Python/Django BB E2E tests
+        # important that what we run here does not use Docker
+        working-directory: core-tests/e2e-tests/python-rest-bb
+        run: mvn clean verify --fae
+        env:
+          CI_env: GithubAction
+
+
   tests:
     runs-on: ubuntu-latest
     needs: full-build-base

.gitignore

@@ -130,6 +130,16 @@ Migrations/
 /core-tests/e2e-tests/spring/spring-rest-bb/javascript/generated/
 /core-tests/e2e-tests/spring/spring-rest-bb/python/generated/
 
+/core-tests/e2e-tests/python-rest-bb/target/
+/core-tests/e2e-tests/python-rest-bb/python/generated/
+/core-tests/e2e-tests/python-rest-bb/maven/src/
+/core-tests/e2e-tests/python-rest-bb/maven/target/
+/core-tests/e2e-tests/python-rest-bb/javascript/node_modules/
+/core-tests/e2e-tests/python-rest-bb/javascript/generated/
+/core-tests/e2e-tests/python-rest-bb/sut/django/db.sqlite3
+/core-tests/e2e-tests/python-rest-bb/sut/django/.venv/
+/core-tests/e2e-tests/python-rest-bb/sut/django/**/__pycache__/
+
 /client-java/test-utils-java/target/
 
 /test-utils/test-utils-py/target/

client-java/controller/src/main/java/org/evomaster/client/java/controller/SutHandler.java

@@ -196,7 +196,8 @@ default void registerOrExecuteInitSqlCommandsIfNeeded(){}
      * reset database if the smart db cleaning is employed
      * </p>
      * @param tablesToClean represents a list of table which will be reset based on specified DbSpecification.
-     *                      note that null tablesToClean means all table will be reset.
+     *                      note that `null` tablesToClean means all table will be reset,
+     *                      empty tablesToClean indicates that none of tables will be reset.
      */
     default void resetDatabase(List<String> tablesToClean){}
 

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/AndCondition.java

@@ -12,11 +12,12 @@ public class AndCondition implements CypherCondition {
     private final List<CypherCondition> conditions;
 
     public AndCondition(List<CypherCondition> conditions) {
-        this.conditions = conditions != null ? new ArrayList<>(conditions) : new ArrayList<>();
+        this.conditions = Collections.unmodifiableList(
+                conditions != null ? new ArrayList<>(conditions) : new ArrayList<>());
     }
 
     public List<CypherCondition> getConditions() {
-        return Collections.unmodifiableList(conditions);
+        return conditions;
     }
 
     @Override

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/AnyLabelCondition.java

@@ -11,7 +11,7 @@ public class AnyLabelCondition implements CypherCondition {
     private final String variableName;
 
     public AnyLabelCondition(String variableName) {
-        this.variableName = variableName;
+        this.variableName = Objects.requireNonNull(variableName, "variableName must not be null");
     }
 
     public String getVariableName() {

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/ArithmeticOperand.java

@@ -21,8 +21,8 @@ public final class ArithmeticOperand implements Operand {
     private final Operand right;
 
     public ArithmeticOperand(ArithmeticOperator operator, Operand left, Operand right) {
-        this.operator = operator;
-        this.left = left;
+        this.operator = Objects.requireNonNull(operator, "operator must not be null");
+        this.left = Objects.requireNonNull(left, "left operand must not be null");
         this.right = right;
     }
 

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/ComparisonCondition.java

@@ -14,8 +14,8 @@ public class ComparisonCondition implements CypherCondition {
     private final Operand right;
 
     public ComparisonCondition(Operand left, ComparisonOperator operator, Operand right) {
-        this.left = left;
-        this.operator = operator;
+        this.left = Objects.requireNonNull(left, "left operand must not be null");
+        this.operator = Objects.requireNonNull(operator, "operator must not be null");
         this.right = right;
     }
 

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/ComparisonOperator.java

@@ -19,7 +19,7 @@ public enum ComparisonOperator {
 
     private final String symbol;
 
-    ComparisonOperator(String symbol) {
+    private ComparisonOperator(String symbol) {
         this.symbol = symbol;
     }
 

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/LabelCondition.java

@@ -12,8 +12,8 @@ public class LabelCondition implements CypherCondition {
     private final String label;
 
     public LabelCondition(String variableName, String label) {
-        this.variableName = variableName;
-        this.label = label;
+        this.variableName = Objects.requireNonNull(variableName, "variableName must not be null");
+        this.label = Objects.requireNonNull(label, "label must not be null");
     }
 
     public String getVariableName() {

client-java/controller/src/main/java/org/evomaster/client/java/controller/neo4j/conditions/ListOperand.java

@@ -13,11 +13,12 @@ public final class ListOperand implements Operand {
     private final List<Operand> elements;
 
     public ListOperand(List<Operand> elements) {
-        this.elements = elements != null ? new ArrayList<>(elements) : new ArrayList<>();
+        this.elements = Collections.unmodifiableList(
+                elements != null ? new ArrayList<>(elements) : new ArrayList<>());
     }
 
     public List<Operand> getElements() {
-        return Collections.unmodifiableList(elements);
+        return elements;
     }
 
     @Override