Skip to content

Commit a301e72

Browse files
author
Kendar
committed
Fixed view and db proxy via ui
1 parent 73e2341 commit a301e72

File tree

10 files changed

+495
-100
lines changed

10 files changed

+495
-100
lines changed

‎globaltest.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ IF exist %UTILS_TODEL_DIR% (
1818
)
1919

2020
cd %STARTING_PATH%\globaltest
21-
call mvn clean install package 2>&1 1>NUL
21+
call mvn clean install package -DskipTests 2>&1 1>NUL
2222
echo [INFO] starting global test runner
2323
cd %STARTING_PATH%\globaltest\globaltest-main\target
2424

‎globaltest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ find $STARTING_PATH -name "*.sh" -exec chmod +x {} \;
1313
rm -f $STARTING_PATH/globaltest*.log
1414
echo "[INFO] Compiling global test runner"
1515
cd $STARTING_PATH/globaltest
16-
mvn clean install package > /dev/null 2>&1
16+
mvn clean install package -DskipTests > /dev/null 2>&1
1717

1818
cd $STARTING_PATH/globaltest/globaltest-main/target
1919

‎globaltest/globaltest-selenium/src/test/java/org/kendar/DbRecordingSetupTest.java‎

Lines changed: 83 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -39,77 +39,16 @@ public static void startup(FirefoxDriver driver) throws Exception {
3939
runBackground();
4040

4141
Thread.sleep(1000);
42+
43+
4244
run(root, env, "gateway");
4345
run(root, env, "fe");
44-
run(root, env, "bedbham");
45-
4646

4747

4848
Thread.sleep(1000);
4949
driver.get("http://www.local.test/index.html");
50-
driver.manage().window().setSize(new Dimension(1024, 768));
51-
Thread.sleep(1000);
52-
doClick(()->driver.findElement(By.linkText("Dns")));
53-
Thread.sleep(1000);
54-
driver.findElement(By.linkText("MAPPINGS")).click();
55-
Thread.sleep(1000);
56-
driver.findElement(By.id("dns-mappings-add")).click();
57-
Thread.sleep(1000);
58-
driver.findElement(By.id("dns")).click();
59-
Thread.sleep(1000);
60-
driver.findElement(By.id("dns")).sendKeys("www.sample.test");
61-
Thread.sleep(1000);
62-
doClick(()->driver.findElement(By.id("mod-save")));
63-
Thread.sleep(1000);
64-
doClick(()->driver.findElement(By.id("dns-mappings-add")));
65-
Thread.sleep(1000);
66-
driver.findElement(By.id("dns")).click();
67-
driver.findElement(By.id("dns")).sendKeys("gateway.sample.test");
68-
doClick(()->driver.findElement(By.id("mod-save")));
69-
driver.findElement(By.id("dns-mappings-add")).click();
70-
driver.findElement(By.id("dns")).click();
71-
driver.findElement(By.id("dns")).sendKeys("be.sample.test");
72-
doClick(()->driver.findElement(By.id("mod-save")));
73-
doClick(()->driver.findElement(By.linkText("Main")));
74-
Thread.sleep(1000);
75-
doClick(()->driver.findElement(By.linkText("SSL/Certificates")));
76-
Thread.sleep(1000);
77-
doClick(()->driver.findElement(By.id("ssl-sites-add")));
78-
Thread.sleep(1000);
79-
doClick(()->driver.findElement(By.id("address")));
80-
driver.findElement(By.id("address")).sendKeys("*.sample.test");
81-
Thread.sleep(1000);
82-
doClick(()->driver.findElement(By.id("mod-save")));
83-
Thread.sleep(1000);
84-
/*{
85-
WebElement element = driver.findElement(By.id("mod-save"));
86-
Actions builder = new Actions(driver);
87-
builder.moveToElement(element).perform();
88-
}
89-
{
90-
WebElement element = driver.findElement(By.tagName("body"));
91-
Actions builder = new Actions(driver);
92-
builder.moveToElement(element, 0, 0).perform();
93-
}
94-
Thread.sleep(1000);*/
95-
doClick(()->driver.findElement(By.id("ssl-sites-add")));
96-
/* {
97-
WebElement element = driver.findElement(By.id("ssl-sites-add"));
98-
Actions builder = new Actions(driver);
99-
builder.moveToElement(element).perform();
100-
}
101-
{
102-
WebElement element = driver.findElement(By.tagName("body"));
103-
Actions builder = new Actions(driver);
104-
builder.moveToElement(element, 0, 0).perform();
105-
}*/
106-
doClick(()->driver.findElement(By.id("address")));
107-
Thread.sleep(1000);
108-
driver.findElement(By.id("address")).sendKeys("sample.test");
109-
Thread.sleep(1000);
110-
doClick(()->driver.findElement(By.id("mod-save")));
111-
Thread.sleep(1000);
112-
doClick(()->driver.findElement(By.linkText("Main")));
50+
driver.manage().window().setSize(new Dimension(1024, 1024));
51+
11352
Thread.sleep(2000);
11453
doClick(()->driver.findElement(By.linkText("Url/Db Rewrites")));
11554
Thread.sleep(1000);
@@ -169,41 +108,103 @@ public static void startup(FirefoxDriver driver) throws Exception {
169108
Thread.sleep(1000);
170109
driver.findElement(By.id("driver")).sendKeys("org.h2.Driver");
171110
Thread.sleep(1000);
172-
driver.findElement(By.id("connectionString")).click();
111+
driver.findElement(By.id("connectionStringR")).click();
173112
Thread.sleep(1000);
174-
driver.findElement(By.id("connectionString")).sendKeys("jdbc:h2:tcp://localhost:9123/./data/be;MODE=MYSQL;");
175-
driver.findElement(By.id("login")).click();
113+
driver.findElement(By.id("connectionStringR")).sendKeys("jdbc:h2:tcp://localhost:9123/./data/be;MODE=MYSQL;");
114+
driver.findElement(By.id("loginR")).click();
176115
Thread.sleep(1000);
177-
driver.findElement(By.id("login")).sendKeys("sa");
116+
driver.findElement(By.id("loginR")).sendKeys("sa");
178117
Thread.sleep(1000);
179118
driver.findElement(By.cssSelector("span > div")).click();
180-
driver.findElement(By.id("password")).click();
119+
driver.findElement(By.id("passwordR")).click();
181120
Thread.sleep(1000);
182-
driver.findElement(By.id("password")).sendKeys("sa");
121+
driver.findElement(By.id("passwordR")).sendKeys("sa");
183122
Thread.sleep(1000);
184-
driver.findElement(By.cssSelector(".card:nth-child(6)")).click();
185-
driver.findElement(By.cssSelector(".card:nth-child(6) > #connectionString")).click();
123+
driver.findElement(By.id("active")).click();
186124
Thread.sleep(1000);
187-
driver.findElement(By.cssSelector(".card:nth-child(6) > #connectionString")).sendKeys("be");
125+
driver.findElement(By.id("connectionStringL")).click();
188126
Thread.sleep(1000);
189-
driver.findElement(By.cssSelector(".card:nth-child(6) > #login")).click();
190-
driver.findElement(By.cssSelector(".card:nth-child(6) > #login")).sendKeys("sa");
127+
driver.findElement(By.id("connectionStringL")).sendKeys("be");
191128
Thread.sleep(1000);
192-
driver.findElement(By.cssSelector(".card:nth-child(6) > #password")).click();
129+
driver.findElement(By.id("loginL")).click();
130+
driver.findElement(By.id("loginL")).sendKeys("login");
193131
Thread.sleep(1000);
194-
driver.findElement(By.cssSelector(".card:nth-child(6) > #password")).sendKeys("sa");
132+
driver.findElement(By.id("passwordL")).click();
195133
Thread.sleep(1000);
196-
driver.findElement(By.cssSelector(".modal-footer")).click();
134+
driver.findElement(By.id("passwordL")).sendKeys("password");
197135
Thread.sleep(1000);
198136
doClick(()->driver.findElement(By.id("mod-save")));
199137
Thread.sleep(1000);
138+
run(root, env, "bedbham");
139+
140+
doClick(()->driver.findElement(By.linkText("Main")));
141+
Thread.sleep(1000);
142+
doClick(()->driver.findElement(By.linkText("Dns")));
143+
Thread.sleep(1000);
144+
driver.findElement(By.linkText("MAPPINGS")).click();
145+
Thread.sleep(1000);
146+
driver.findElement(By.id("dns-mappings-add")).click();
147+
Thread.sleep(1000);
148+
driver.findElement(By.id("dns")).click();
149+
Thread.sleep(1000);
150+
driver.findElement(By.id("dns")).sendKeys("www.sample.test");
151+
Thread.sleep(1000);
152+
doClick(()->driver.findElement(By.id("mod-save")));
153+
Thread.sleep(1000);
154+
doClick(()->driver.findElement(By.id("dns-mappings-add")));
155+
Thread.sleep(1000);
156+
driver.findElement(By.id("dns")).click();
157+
driver.findElement(By.id("dns")).sendKeys("gateway.sample.test");
158+
doClick(()->driver.findElement(By.id("mod-save")));
159+
driver.findElement(By.id("dns-mappings-add")).click();
160+
driver.findElement(By.id("dns")).click();
161+
driver.findElement(By.id("dns")).sendKeys("be.sample.test");
162+
doClick(()->driver.findElement(By.id("mod-save")));
163+
doClick(()->driver.findElement(By.linkText("Main")));
164+
Thread.sleep(1000);
165+
doClick(()->driver.findElement(By.linkText("SSL/Certificates")));
166+
Thread.sleep(1000);
167+
doClick(()->driver.findElement(By.id("ssl-sites-add")));
168+
Thread.sleep(1000);
169+
doClick(()->driver.findElement(By.id("address")));
170+
driver.findElement(By.id("address")).sendKeys("*.sample.test");
171+
Thread.sleep(1000);
172+
doClick(()->driver.findElement(By.id("mod-save")));
173+
Thread.sleep(1000);
174+
/*{
175+
WebElement element = driver.findElement(By.id("mod-save"));
176+
Actions builder = new Actions(driver);
177+
builder.moveToElement(element).perform();
178+
}
179+
{
180+
WebElement element = driver.findElement(By.tagName("body"));
181+
Actions builder = new Actions(driver);
182+
builder.moveToElement(element, 0, 0).perform();
183+
}
184+
Thread.sleep(1000);*/
185+
doClick(()->driver.findElement(By.id("ssl-sites-add")));
186+
/* {
187+
WebElement element = driver.findElement(By.id("ssl-sites-add"));
188+
Actions builder = new Actions(driver);
189+
builder.moveToElement(element).perform();
190+
}
191+
{
192+
WebElement element = driver.findElement(By.tagName("body"));
193+
Actions builder = new Actions(driver);
194+
builder.moveToElement(element, 0, 0).perform();
195+
}*/
196+
doClick(()->driver.findElement(By.id("address")));
197+
Thread.sleep(1000);
198+
driver.findElement(By.id("address")).sendKeys("sample.test");
199+
Thread.sleep(1000);
200+
doClick(()->driver.findElement(By.id("mod-save")));
201+
Thread.sleep(1000);
202+
200203
doClick(()->driver.findElement(By.linkText("Main")));
201-
}
202204

203-
public static void fullNavigation(FirefoxDriver driver) {
204-
throw new NotImplementedException();
205205
}
206206

207+
207208
public static void analyzeRecording(FirefoxDriver driver, String idRecording) {
208209
throw new NotImplementedException();
209210
}

‎globaltest/globaltest-selenium/src/test/java/org/kendar/DbRecordingUiActions.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package org.kendar;
2+
3+
import org.openqa.selenium.By;
4+
import org.openqa.selenium.Dimension;
5+
import org.openqa.selenium.firefox.FirefoxDriver;
6+
7+
public class DbRecordingUiActions {
8+
9+
public static void fullNavigation(FirefoxDriver driver) throws InterruptedException {
10+
11+
driver.get("http://www.sample.test/");
12+
Thread.sleep(1000);
13+
driver.manage().window().setSize(new Dimension(1024, 1024));
14+
Thread.sleep(1000);
15+
driver.findElement(By.id("appoint-add")).click();
16+
Thread.sleep(1000);
17+
driver.findElement(By.id("role")).click();
18+
Thread.sleep(1000);
19+
driver.findElement(By.id("role")).sendKeys("Doctor");
20+
Thread.sleep(1000);
21+
driver.findElement(By.id("name")).sendKeys("John Doe");
22+
driver.findElement(By.id("mod-save")).click();
23+
Thread.sleep(1000);
24+
driver.findElement(By.id("grid-rowe-0-2")).click();
25+
Thread.sleep(1000);
26+
driver.findElement(By.id("appoint-add")).click();
27+
Thread.sleep(1000);
28+
driver.findElement(By.id("description")).click();
29+
Thread.sleep(1000);
30+
driver.findElement(By.id("description")).sendKeys("Visit");
31+
driver.findElement(By.id("mod-save")).click();
32+
Thread.sleep(1000);
33+
driver.findElement(By.id("grid-rowe-0-2")).click();
34+
Thread.sleep(1000);
35+
driver.findElement(By.id("grid-rowe-0-2")).click();
36+
Thread.sleep(1000);
37+
driver.findElement(By.id("grid-rowe-0-1")).click();
38+
driver.findElement(By.cssSelector(".row")).click();
39+
Thread.sleep(1000);
40+
driver.findElement(By.linkText("Employees")).click();
41+
Thread.sleep(1000);
42+
driver.findElement(By.id("grid-rowe-0-0")).click();
43+
Thread.sleep(1000);
44+
driver.findElement(By.id("name")).click();
45+
Thread.sleep(1000);
46+
driver.findElement(By.id("name")).sendKeys("Jane Doe");
47+
driver.findElement(By.id("mod-save")).click();
48+
Thread.sleep(1000);
49+
driver.findElement(By.id("grid-rowe-0-1")).click();
50+
Thread.sleep(1000);
51+
}
52+
}

‎globaltest/globaltest-selenium/src/test/java/org/kendar/GoogleHackSetupTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
public class GoogleHackSetupTest {
1414

1515
public static void verify(FirefoxDriver driver) throws InterruptedException {
16+
17+
1618
driver.get("https://www.google.com");
1719
Thread.sleep(1000);
20+
driver.manage().window().setSize(new Dimension(1024, 1024));
21+
Thread.sleep(1000);
1822
WebElement el = driver.findElement(By.xpath("//*[text()='Accetta tutto']"));
1923
if(el==null){
2024
el = driver.findElement(By.xpath("//*[text()='Accept all']"));
@@ -40,7 +44,7 @@ public static void setup(FirefoxDriver driver) throws InterruptedException {
4044
assertFalse(text.contains("Bing_logo"));
4145
driver.get("http://www.local.test/index.html");
4246
Thread.sleep(1000);
43-
driver.manage().window().setSize(new Dimension(1024, 768));
47+
driver.manage().window().setSize(new Dimension(1024, 1024));
4448
Thread.sleep(1000);
4549
driver.findElement(By.id("grid-rowc-2-0")).click();
4650
Thread.sleep(1000);

‎globaltest/globaltest-selenium/src/test/java/org/kendar/SeleniumBase.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ public static void runHamJar(Class<?> caller) throws Exception {
292292
var commandLine = new ArrayList<String>();
293293

294294
deleteDirectory(Path.of(getRootPath(caller),"data","tmp").toFile());
295+
deleteDirectory(Path.of(getRootPath(caller),"release","calendar","data").toFile());
295296
var java = "java";
296297
//var agentPath = Path.of(getRootPath(caller), "ham", "api.test", "org.jacoco.agent-0.8.8-runtime.jar");
297298
//var jacocoExecPath = Path.of(getRootPath(caller), "ham", "api.test", "target", "jacoco_starter.exec");

‎globaltest/globaltest-selenium/src/test/java/org/kendar/SeleniumTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ void dbRecording() throws Throwable {
2525
var driver = SeleniumBase.getDriver();
2626
DbRecordingSetupTest.startup(driver);
2727

28+
DbRecordingUiActions.fullNavigation(driver);
29+
2830
//Create recording
2931
String mainId = DbRecordingSetupTest.startRecording(driver,"Main");
30-
DbRecordingSetupTest.fullNavigation(driver);
32+
3133
DbRecordingSetupTest.stopAction(driver,mainId);
3234
DbRecordingSetupTest.analyzeRecording(driver,mainId);
3335
var recordingData = DbRecordingSetupTest.downloadRecording(driver);
@@ -36,7 +38,7 @@ void dbRecording() throws Throwable {
3638
restart();
3739
String uiTestId = DbRecordingSetupTest.prepareUiTest(driver,recordingData,"UiTest");
3840
DbRecordingSetupTest.startPlaying(driver,uiTestId);
39-
DbRecordingSetupTest.fullNavigation(driver);
41+
DbRecordingUiActions.fullNavigation(driver);
4042
DbRecordingSetupTest.stopAction(driver, uiTestId);
4143

4244
//Do Gateway null test

0 commit comments

Comments
 (0)