Skip to content

Commit 62c6933

Browse files
FullstackGJJckoulopoul
FullstackGJJ
and
ckoulopoul
authored
fix(integ-tests): removed problematic logic in integ tests (#63)
* fixed broken integ tests and increased performance of test config * removing gson * improved readability * remove gson dependency Co-authored-by: ckoulopoul <christine.koulopoulos@factset.com>
1 parent ec1ea19 commit 62c6933

14 files changed

Lines changed: 118 additions & 144 deletions

‎tests/pom.xml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,30 @@
44
<groupId>com.factset</groupId>
55
<artifactId>tests</artifactId>
66
<version>0.0.1</version>
7+
8+
<build>
9+
<plugins>
10+
<plugin>
11+
<groupId>org.apache.maven.plugins</groupId>
12+
<artifactId>maven-surefire-plugin</artifactId>
13+
<version>3.0.0-M5</version>
14+
<configuration>
15+
<parallel>classes</parallel>
16+
<useUnlimitedThreads>true</useUnlimitedThreads>
17+
<includes>
18+
ApiTestsRunner.java
19+
</includes>
20+
<properties>
21+
<property>
22+
<name>listener</name>
23+
<value>testconfig.PrintOutCurrentTestRunListener</value>
24+
</property>
25+
</properties>
26+
</configuration>
27+
</plugin>
28+
</plugins>
29+
</build>
30+
731
<dependencies>
832
<dependency>
933
<groupId>com.google.protobuf</groupId>
@@ -96,8 +120,6 @@
96120
<version>${junit-version}</version>
97121
</dependency>
98122
<dependency>
99-
<scope>system</scope>
100-
<systemPath>${project.basedir}/../auto-generated-sdk/target/engines-sdk-5.1.0.jar</systemPath>
101123
<groupId>com.factset.analyticsapi</groupId>
102124
<artifactId>engines-sdk</artifactId>
103125
<version>${engines-sdk-version}</version>
@@ -127,4 +149,4 @@
127149
<engines-sdk-version>5.1.0</engines-sdk-version>
128150
<poi-ooxml-version>4.0.1</poi-ooxml-version>
129151
</properties>
130-
</project>
152+
</project>

‎tests/src/test/java/Api/AfiInteractiveOptimizerEngineApiTests.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.List;
44
import java.util.Map;
5+
56
import factset.analyticsapi.engines.models.*;
67
import com.fasterxml.jackson.core.JsonProcessingException;
78
import factset.analyticsapi.engines.ApiClient;
@@ -79,15 +80,8 @@ public void enginesApiGetOptimizationSuccess() throws ApiException, JsonProcessi
7980
headers = response.getHeaders();
8081
Assert.assertTrue("Get status response status code should be 201 or 202",
8182
response.getStatusCode() == 201 || response.getStatusCode() == 202);
82-
List<String> cacheControl = headers.get("Cache-Control");
83-
if (cacheControl != null) {
84-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
85-
System.out.println("Sleeping for: " + maxAge + " seconds");
86-
Thread.sleep(maxAge * 1000L);
87-
} else {
88-
System.out.println("Sleeping for: 2 seconds");
89-
Thread.sleep(2 * 1000L);
90-
}
83+
System.out.println("Sleeping for: 10 seconds");
84+
Thread.sleep(10 * 1000L);
9185
} while(response.getStatusCode() == 202);
9286
break;
9387
}

‎tests/src/test/java/Api/ApiTestsRunner.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,35 @@
44
import org.junit.runners.Suite;
55

66
@RunWith(Suite.class)
7-
@Suite.SuiteClasses({ AccountsApiTests.class,
8-
AfiInteractiveOptimizerEngineApiTests.class,
9-
AxpInteractiveOptimizerEngineApiTests.class,
10-
BenchmarksApiTests.class,
11-
BpmInteractiveOptimizerEngineApiTests.class,
12-
ColumnsApiTests.class,
13-
ColumnStatisticsApiTests.class,
14-
ComponentsApiTests.class,
15-
ConfigurationsApiTests.class,
16-
CurrenciesApiTests.class,
17-
DatesApiTests.class,
18-
DocumentsApiTests.class,
19-
FiabInteractiveEngineApiTests.class,
20-
FiInteractiveEngineApiTests.class,
21-
FpoInteractiveOptimizerEngineApiTests.class,
22-
FrequenciesApiTests.class,
23-
GroupsApiTests.class,
24-
PAEngineApiTests.class,
25-
PAEngineInteractiveApiTests.class,
26-
PubEngineApiTests.class,
27-
PubEngineInteractiveApiTests.class,
28-
QuantInteractiveEngineTests.class,
29-
SPAREngineApiTests.class,
30-
SPAREngineInteractiveApiTests.class,
31-
StrategyDocumentsApiTests.class,
32-
VaultEngineApiTests.class,
33-
VaultEngineInteractiveApiTests.class })
7+
@Suite.SuiteClasses({
8+
AccountsApiTests.class,
9+
AfiInteractiveOptimizerEngineApiTests.class,
10+
AxpInteractiveOptimizerEngineApiTests.class,
11+
BenchmarksApiTests.class,
12+
BpmInteractiveOptimizerEngineApiTests.class,
13+
ColumnsApiTests.class,
14+
ColumnStatisticsApiTests.class,
15+
ComponentsApiTests.class,
16+
ConfigurationsApiTests.class,
17+
CurrenciesApiTests.class,
18+
DatesApiTests.class,
19+
DocumentsApiTests.class,
20+
FiabInteractiveEngineApiTests.class,
21+
FiInteractiveEngineApiTests.class,
22+
FpoInteractiveOptimizerEngineApiTests.class,
23+
FrequenciesApiTests.class,
24+
GroupsApiTests.class,
25+
PAEngineApiTests.class,
26+
PAEngineInteractiveApiTests.class,
27+
PubEngineApiTests.class,
28+
PubEngineInteractiveApiTests.class,
29+
QuantInteractiveEngineTests.class,
30+
SPAREngineApiTests.class,
31+
SPAREngineInteractiveApiTests.class,
32+
StrategyDocumentsApiTests.class,
33+
VaultEngineApiTests.class,
34+
VaultEngineInteractiveApiTests.class
35+
})
3436
public class ApiTestsRunner {
3537
/*
3638
* Purpose of this class is to run the test cases contained in the compiled java

‎tests/src/test/java/Api/AxpInteractiveOptimizerEngineApiTests.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,8 @@ public void enginesApiGetOptimizationSuccess() throws ApiException, JsonProcessi
9696
headers = response.getHeaders();
9797
Assert.assertTrue("Get status response status code should be 201 or 202",
9898
response.getStatusCode() == 201 || response.getStatusCode() == 202);
99-
List<String> cacheControl = headers.get("Cache-Control");
100-
if (cacheControl != null) {
101-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
102-
System.out.println("Sleeping for: " + maxAge + " seconds");
103-
Thread.sleep(maxAge * 1000L);
104-
} else {
105-
System.out.println("Sleeping for: 2 seconds");
106-
Thread.sleep(2 * 1000L);
107-
}
99+
System.out.println("Sleeping for: 10 seconds");
100+
Thread.sleep(10 * 1000L);
108101
} while(response.getStatusCode() == 202);
109102
break;
110103
}

‎tests/src/test/java/Api/BpmInteractiveOptimizerEngineApiTests.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,8 @@ public void enginesApiGetOptimizationSuccess() throws ApiException, JsonProcessi
8484
headers = response.getHeaders();
8585
Assert.assertTrue("Get status response status code should be 201 or 202",
8686
response.getStatusCode() == 201 || response.getStatusCode() == 202);
87-
List<String> cacheControl = headers.get("Cache-Control");
88-
if (cacheControl != null) {
89-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
90-
System.out.println("Sleeping for: " + maxAge + " seconds");
91-
Thread.sleep(maxAge * 1000L);
92-
} else {
93-
System.out.println("Sleeping for: 2 seconds");
94-
Thread.sleep(2 * 1000L);
95-
}
87+
System.out.println("Sleeping for: 10 seconds");
88+
Thread.sleep(10 * 1000L);
9689
} while(response.getStatusCode() == 202);
9790
break;
9891
}

‎tests/src/test/java/Api/FiInteractiveEngineApiTests.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,8 @@ public void enginesApiGetCalculationSuccess() throws ApiException, JsonProcessin
9191
headers = response.getHeaders();
9292
Assert.assertTrue("Get status response status code should be 201 or 202",
9393
response.getStatusCode() == 201 || response.getStatusCode() == 202);
94-
List<String> cacheControl = headers.get("Cache-Control");
95-
if (cacheControl != null) {
96-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
97-
System.out.println("Sleeping for: " + maxAge + " seconds");
98-
Thread.sleep(maxAge * 1000L);
99-
} else {
100-
System.out.println("Sleeping for: 2 seconds");
101-
Thread.sleep(2 * 1000L);
102-
}
94+
System.out.println("Sleeping for: 10 seconds");
95+
Thread.sleep(10 * 1000L);
10396
} while(response.getStatusCode() == 202);
10497
break;
10598
}

‎tests/src/test/java/Api/FiabInteractiveEngineApiTests.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,9 @@ public void enginesApiGetCalculationSuccess() throws ApiException, JsonProcessin
6969

7070
do {
7171
resultStatus = apiInstance.getCalculationByIdWithHttpInfo(requestId);
72-
List<String> cacheControl = headers.get("Cache-Control");
73-
if (cacheControl != null) {
74-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
75-
System.out.println("Sleeping for: " + maxAge + " seconds");
76-
Thread.sleep(maxAge * 1000L);
77-
} else {
78-
System.out.println("Sleeping for: 2 seconds");
79-
Thread.sleep(2 * 1000L);
80-
}
81-
} while(resultStatus.getStatusCode() == 202);
72+
System.out.println("Sleeping for: 10 seconds");
73+
Thread.sleep(10 * 1000L);
74+
} while(resultStatus.getStatusCode() == 202);
8275

8376
Assert.assertTrue("Result Status returned should be 200", resultStatus.getStatusCode() == 200);
8477
}

‎tests/src/test/java/Api/FpoInteractiveOptimizerEngineApiTests.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,8 @@ public void enginesApiGetOptimizationSuccess() throws ApiException, JsonProcessi
9494
headers = response.getHeaders();
9595
Assert.assertTrue("Get status response status code should be 201 or 202",
9696
response.getStatusCode() == 201 || response.getStatusCode() == 202);
97-
List<String> cacheControl = headers.get("Cache-Control");
98-
if (cacheControl != null) {
99-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
100-
System.out.println("Sleeping for: " + maxAge + " seconds");
101-
Thread.sleep(maxAge * 1000L);
102-
} else {
103-
System.out.println("Sleeping for: 2 seconds");
104-
Thread.sleep(2 * 1000L);
105-
}
97+
System.out.println("Sleeping for: 10 seconds");
98+
Thread.sleep(10 * 1000L);
10699
} while(response.getStatusCode() == 202);
107100
break;
108101
}

‎tests/src/test/java/Api/PAEngineInteractiveApiTests.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,8 @@ public void enginesApiGetCalculationSuccess() throws ApiException, JsonProcessin
9393
resultStatus = (CalculationStatusRoot)resultStatusResponse.getData();
9494
Assert.assertTrue("Get status response status code should be 200 or 202",
9595
resultStatusResponse.getStatusCode() == 200 || resultStatusResponse.getStatusCode() == 202);
96-
List<String> cacheControl = headers.get("Cache-Control");
97-
if (cacheControl != null) {
98-
int maxAge = Integer.parseInt(cacheControl.get(0).replace("max-age=", ""));
99-
System.out.println("Sleeping for: " + maxAge + " seconds");
100-
Thread.sleep(maxAge * 1000L);
101-
} else {
102-
System.out.println("Sleeping for: 2 seconds");
103-
Thread.sleep(2 * 1000L);
104-
}
96+
System.out.println("Sleeping for: 10 seconds");
97+
Thread.sleep(10 * 1000L);
10598
} while(resultStatusResponse.getStatusCode() == 202);
10699

107100
for(CalculationUnitStatus unitStatus : resultStatus.getData().getUnits().values()) {

‎tests/src/test/java/Api/PubEngineInteractiveApiTests.java‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,12 @@ public void enginesApiGetCalculationSuccess() throws ApiException, JsonProcessin
8888
resultStatus = (CalculationStatusRoot)resultStatusResponse.getData();
8989
Assert.assertTrue("Get status response status code should be 200 or 202",
9090
resultStatusResponse.getStatusCode() == 200 || resultStatusResponse.getStatusCode() == 202);
91-
if (headers.containsKey("cache-control")) {
92-
int maxAge = Integer.parseInt(headers.get("cache-control").get(0).split("=")[1]);
93-
try {
94-
System.out.println("\n **** Waiting for " + maxAge + " seconds **** \n");
95-
TimeUnit.SECONDS.sleep(maxAge);
96-
} catch (InterruptedException ex) {
97-
Thread.currentThread().interrupt();
98-
}
99-
} else {
100-
int waitTimeInSeconds = 5;
101-
try {
102-
System.out.println("\n **** Waiting for " + waitTimeInSeconds + " seconds **** \n");
103-
TimeUnit.SECONDS.sleep(waitTimeInSeconds);
104-
} catch (InterruptedException ex) {
105-
Thread.currentThread().interrupt();
106-
}
91+
int waitTimeInSeconds = 10;
92+
try {
93+
System.out.println("\n **** Waiting for " + waitTimeInSeconds + " seconds **** \n");
94+
TimeUnit.SECONDS.sleep(waitTimeInSeconds);
95+
} catch (InterruptedException ex) {
96+
Thread.currentThread().interrupt();
10797
}
10898
} while(resultStatusResponse.getStatusCode() == 202);
10999
for(CalculationUnitStatus unitStatus : resultStatus.getData().getUnits().values()) {

0 commit comments

Comments
 (0)