Skip to content

Commit be5c8cc

Browse files
authored
Merge pull request #49 from ing-bank/feature/Kafka
Feature/kafka
2 parents 4b18c8e + d2816c6 commit be5c8cc

File tree

29 files changed

+1328
-1210
lines changed

29 files changed

+1328
-1210
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16-
- name: Set up JDK 17
16+
- name: Set up JDK 11
1717
uses: actions/setup-java@v4
1818
with:
19-
java-version: '17'
19+
java-version: '11'
2020
distribution: 'temurin'
2121
cache: maven
2222
- name: Build with Maven

Common/src/main/java/com/ing/parent/createParentPOM.java

Lines changed: 173 additions & 107 deletions
Large diffs are not rendered by default.

Datalib/src/main/java/com/ing/datalib/settings/Capabilities.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ private void createFile(String fileName) {
153153
// Add default key-value pairs
154154
prop.setProperty("setHeadless", "false");
155155
prop.setProperty("setSlowMo", "");
156-
prop.setProperty("startMaximized", "");
157156
prop.setProperty("setDevtools", "");
158157
prop.setProperty("setDownloadsPath", "");
159158
prop.setProperty("setExecutablePath", "");

Engine/src/main/java/com/ing/engine/commands/browser/Assertions.java

Lines changed: 104 additions & 72 deletions
Large diffs are not rendered by default.

Engine/src/main/java/com/ing/engine/commands/browser/Command.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
import javax.jms.JMSContext;
3333
import javax.jms.JMSProducer;
3434
import javax.jms.TextMessage;
35+
import org.apache.kafka.clients.consumer.ConsumerRecord;
36+
import org.apache.kafka.clients.consumer.KafkaConsumer;
37+
import org.apache.kafka.clients.producer.KafkaProducer;
38+
import org.apache.kafka.clients.producer.ProducerRecord;
3539
import org.openqa.selenium.WebDriver;
3640
import org.openqa.selenium.WebElement;
3741
import org.apache.kafka.common.header.Header;
@@ -132,19 +136,29 @@ public class Command {
132136

133137

134138
/**
135-
* *** Queue ****
139+
* *** Kafka ****
136140
*/
137141

138142
static public Map<String, List<Header>> kafkaHeaders = new HashMap<>();
139-
static public Map<String, String> kafkaTopic = new HashMap<>();
143+
static public Map<String, String> kafkaProducerTopic = new HashMap<>();
144+
static public Map<String, String> kafkaConsumerTopic = new HashMap<>();
145+
static public Map<String, String> kafkaConsumerGroupId = new HashMap<>();
140146
static public Map<String, String> kafkaServers = new HashMap<>();
141147
static public Map<String, String> kafkaSchemaRegistryURL = new HashMap<>();
142148
static public Map<String, Integer> kafkaPartition = new HashMap<>();
143149
static public Map<String, Long> kafkaTimeStamp = new HashMap<>();
144150
static public Map<String, String> kafkaKey = new HashMap<>();
145151
static public Map<String, String> kafkaKeySerializer = new HashMap<>();
152+
static public Map<String, String> kafkaKeyDeserializer = new HashMap<>();
146153
static public Map<String, String> kafkaValue = new HashMap<>();
147154
static public Map<String, String> kafkaValueSerializer = new HashMap<>();
155+
static public Map<String, String> kafkaValueDeserializer = new HashMap<>();
156+
static public Map<String, ProducerRecord> kafkaProducerRecord = new HashMap<>();
157+
static public Map<String, ConsumerRecord> kafkaConsumerRecord = new HashMap<>();
158+
static public Map<String, KafkaProducer> kafkaProducer = new HashMap<>();
159+
static public Map<String, KafkaConsumer> kafkaConsumer = new HashMap<>();
160+
static public Map<String, Integer> kafkaConsumerPollRetries = new HashMap<>();
161+
static public Map<String, Long> kafkaConsumerPollDuration = new HashMap<>();
148162

149163

150164
/**

Engine/src/main/java/com/ing/engine/commands/general/GeneralOperations.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,6 @@ public void storeVariableInDataSheet() {
142142
}
143143
}
144144

145-
@Action(object = ObjectType.GENERAL, desc = "store value [<Data>] in Variable [<Condition>]", input = InputType.YES, condition = InputType.YES)
146-
public void storeVariable() {
147-
if (Condition.startsWith("%") && Condition.endsWith("%")) {
148-
addVar(Condition, Data);
149-
Report.updateTestLog(Action, "Value" + Data + "' is stored in Variable '" + Condition + "'", Status.DONE);
150-
} else {
151-
Report.updateTestLog(Action, "Variable format is not correct", Status.DEBUG);
152-
}
153-
}
154-
155145
public void replaceFunction() {
156146
String op = "";
157147
String original = "";

0 commit comments

Comments
 (0)