Skip to content

Commit 06d98e5

Browse files
aszyrejaszyrej
committed
Refactor for PR review
1 parent 3146af9 commit 06d98e5

8 files changed

Lines changed: 23 additions & 21 deletions

File tree

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/RedisCommandEvaluation.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/redis/RedisCommandEvaluation.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
1-
package org.evomaster.client.java.controller.internal.db;
1+
package org.evomaster.client.java.controller.internal.db.redis;
22

33
import org.evomaster.client.java.instrumentation.RedisCommand;
44

55
/**
66
* This class will link a given RedisCommand to the result of the distance calculation for that commmand.
77
*/
88
public class RedisCommandEvaluation {
9-
public final RedisCommand redisCommand;
10-
public final RedisDistanceWithMetrics redisDistanceWithMetrics;
9+
private final RedisCommand redisCommand;
10+
private final RedisDistanceWithMetrics redisDistanceWithMetrics;
1111

1212
public RedisCommandEvaluation(RedisCommand redisCommand, RedisDistanceWithMetrics redisDistanceWithMetrics) {
1313
this.redisCommand = redisCommand;
1414
this.redisDistanceWithMetrics = redisDistanceWithMetrics;
1515
}
16+
17+
public RedisCommand getRedisCommand() {
18+
return redisCommand;
19+
}
20+
21+
public RedisDistanceWithMetrics getRedisDistanceWithMetrics() {
22+
return redisDistanceWithMetrics;
23+
}
1624
}

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/RedisDistanceWithMetrics.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/redis/RedisDistanceWithMetrics.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.evomaster.client.java.controller.internal.db;
1+
package org.evomaster.client.java.controller.internal.db.redis;
22

33
/**
44
* This class will have the distance for a RedisCommand (between 0 and 1)
55
* and the number of evaluated keys in that distance calculation.
66
*/
77
public class RedisDistanceWithMetrics {
8-
public final double redisDistance; // A number between 0 and 1.
9-
public final int numberOfEvaluatedKeys;
8+
private final double redisDistance; // A number between 0 and 1.
9+
private final int numberOfEvaluatedKeys;
1010

1111
public RedisDistanceWithMetrics(double redisDistance, int numberOfEvaluatedKeys) {
1212
if(redisDistance < 0){

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/RedisHandler.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/redis/RedisHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.evomaster.client.java.controller.internal.db;
1+
package org.evomaster.client.java.controller.internal.db.redis;
22

33
import org.evomaster.client.java.controller.internal.TaintHandlerExecutionTracer;
44
import org.evomaster.client.java.controller.redis.RedisClient;

‎client-java/controller/src/main/java/org/evomaster/client/java/controller/redis/RedisHeuristicsCalculator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.evomaster.client.java.controller.redis;
22

3-
import org.evomaster.client.java.controller.internal.db.RedisDistanceWithMetrics;
3+
import org.evomaster.client.java.controller.internal.db.redis.RedisDistanceWithMetrics;
44
import org.evomaster.client.java.distance.heuristics.DistanceHelper;
55
import org.evomaster.client.java.distance.heuristics.TruthnessUtils;
66
import org.evomaster.client.java.instrumentation.RedisCommand;

‎client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/RedisDistanceWithMetricsTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.evomaster.client.java.controller.internal.db;
22

3+
import org.evomaster.client.java.controller.internal.db.redis.RedisDistanceWithMetrics;
34
import org.junit.jupiter.api.Test;
45

56
import static org.junit.jupiter.api.Assertions.assertThrows;

‎client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/redis/RedisHandlerIntegrationTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.evomaster.client.java.controller.internal.db.redis;
22

3-
import org.evomaster.client.java.controller.internal.db.RedisCommandEvaluation;
4-
import org.evomaster.client.java.controller.internal.db.RedisHandler;
53
import org.evomaster.client.java.instrumentation.RedisCommand;
64
import org.evomaster.client.java.controller.redis.RedisClient;
75
import org.junit.jupiter.api.*;
@@ -72,19 +70,19 @@ void testHeuristicDistanceForStringExists() {
7270
assertEquals(2, evals.size(), "Should be two command evaluations.");
7371

7472
RedisCommandEvaluation evalForSimilar = evals.get(0);
75-
assertNotNull(evalForSimilar.redisDistanceWithMetrics);
73+
assertNotNull(evalForSimilar.getRedisDistanceWithMetrics());
7674
RedisCommandEvaluation evalForDifferent = evals.get(1);
77-
assertNotNull(evalForDifferent.redisDistanceWithMetrics);
75+
assertNotNull(evalForDifferent.getRedisDistanceWithMetrics());
7876

79-
double distanceForSimilar = evalForSimilar.redisDistanceWithMetrics.getDistance();
80-
int evaluatedForSimilar = evalForSimilar.redisDistanceWithMetrics.getNumberOfEvaluatedKeys();
77+
double distanceForSimilar = evalForSimilar.getRedisDistanceWithMetrics().getDistance();
78+
int evaluatedForSimilar = evalForSimilar.getRedisDistanceWithMetrics().getNumberOfEvaluatedKeys();
8179

8280
assertTrue(distanceForSimilar >= 0 && distanceForSimilar <= 1,
8381
"Distance should be between 0 and 1");
8482
assertEquals(2, evaluatedForSimilar, "Both keys should be evaluated.");
8583

86-
double distanceForDifferent = evalForDifferent.redisDistanceWithMetrics.getDistance();
87-
int evaluatedForDifferent = evalForDifferent.redisDistanceWithMetrics.getNumberOfEvaluatedKeys();
84+
double distanceForDifferent = evalForDifferent.getRedisDistanceWithMetrics().getDistance();
85+
int evaluatedForDifferent = evalForDifferent.getRedisDistanceWithMetrics().getNumberOfEvaluatedKeys();
8886

8987
assertTrue(distanceForDifferent >= 0 && distanceForDifferent <= 1,
9088
"Distance should be between 0 and 1");

‎client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/redis/RedisHandlerTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.evomaster.client.java.controller.internal.db.redis;
22

3-
import org.evomaster.client.java.controller.internal.db.RedisCommandEvaluation;
4-
import org.evomaster.client.java.controller.internal.db.RedisHandler;
53
import org.evomaster.client.java.instrumentation.RedisCommand;
64
import org.junit.jupiter.api.BeforeEach;
75
import org.junit.jupiter.api.Test;

‎client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/redis/RedisHeuristicsCalculatorTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.evomaster.client.java.controller.internal.db.redis;
22

3-
import org.evomaster.client.java.controller.internal.db.RedisDistanceWithMetrics;
4-
import org.evomaster.client.java.controller.redis.RedisClient;
53
import org.evomaster.client.java.controller.redis.RedisHeuristicsCalculator;
64
import org.evomaster.client.java.controller.redis.RedisInfo;
75
import org.evomaster.client.java.instrumentation.RedisCommand;
@@ -11,7 +9,6 @@
119
import java.util.*;
1210

1311
import static org.junit.jupiter.api.Assertions.*;
14-
import static org.mockito.Mockito.*;
1512

1613
class RedisHeuristicsCalculatorTest {
1714

0 commit comments

Comments
 (0)