Skip to content

Commit

Permalink
Merge pull request #507 from jdi-testing/release_1_1_12
Browse files Browse the repository at this point in the history
Release info is added
  • Loading branch information
pnatashap authored Nov 15, 2022
2 parents 21f2db0 + 9ef22d7 commit 593ea2e
Show file tree
Hide file tree
Showing 7 changed files with 244 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Compile jdi code
id: jdi-compile
run: mvn clean install -DskipTests
run: mvn clean install -DskipTests -Dsource.skip -Dmaven.source.skip -Dmaven.javadoc.skip=true

- name: Run tests - BDD
id: testsBdd
Expand Down
66 changes: 66 additions & 0 deletions jdi-dark-bdd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,70 @@
</plugins>
</build>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>romaniovlev</id>
<name>Roman Iovlev</name>
<email>[email protected]</email>
<timezone>UTC+3</timezone>
</developer>
</developers>

<scm>
<connection>scm:https://github.com/jdi-testing</connection>
<developerConnection>scm:https://github.com/jdi-testing</developerConnection>
<url>https://github.com/jdi-testing</url>
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<profiles>
<profile>
<id>sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>false</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<passphrase>${gpg.key}</passphrase>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public enum CensusYear {
UNKNOWN("Unknown"),
@XmlEnumValue("NineteenNinety")
NINETEEN_NINETY("NineteenNinety"),

@XmlEnumValue("TwoThousandTwenty")
TWO_THOUSAND_TWENTY("TwoThousandTwenty"),
@XmlEnumValue("TwoThousand")
TWO_THOUSAND("TwoThousand"),
@XmlEnumValue("TwoThousandTen")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ public void checkGeocodeAddressNonParsed() {
.withShouldNotStoreTransactionDetails(false)
);
Assertions.assertThat(response.getGeocodeAddressNonParsedResult().getQueryStatusCodes()).isEqualTo(200);
List<WebServiceGeocodeQueryResult> results = response.getGeocodeAddressNonParsedResult().getWebServiceGeocodeQueryResults().getWebServiceGeocodeQueryResult();
List<WebServiceGeocodeQueryResult> results = response.getGeocodeAddressNonParsedResult()
.getWebServiceGeocodeQueryResults().getWebServiceGeocodeQueryResult();
List<CensusOutputRecord> censusOutputRecords = results.get(0).getCensusRecords().getCensusOutputRecord();
Assertions.assertThat(censusOutputRecords.stream().map(CensusOutputRecord::getCensusYear).collect(Collectors.toList()))
.isEqualTo(Arrays.asList(CensusYear.NINETEEN_NINETY, CensusYear.TWO_THOUSAND, CensusYear.TWO_THOUSAND_TEN));
.isEqualTo(Arrays.asList(CensusYear.NINETEEN_NINETY, CensusYear.TWO_THOUSAND,
CensusYear.TWO_THOUSAND_TEN, CensusYear.TWO_THOUSAND_TWENTY));
}

@Test
Expand All @@ -52,16 +54,20 @@ public void checkGeocodeAddressNonParsed12() {
.withCensusYear(CensusYear.ALL_AVAILABLE)
.withShouldNotStoreTransactionDetails(false)
);
Assertions.assertThat(response.getGeocodeAddressNonParsedResult().getQueryStatusCodes()).isEqualTo(200);
List<WebServiceGeocodeQueryResult> results = response.getGeocodeAddressNonParsedResult().getWebServiceGeocodeQueryResults().getWebServiceGeocodeQueryResult();
Assertions.assertThat(response.getGeocodeAddressNonParsedResult().getQueryStatusCodes())
.isEqualTo(200);
List<WebServiceGeocodeQueryResult> results = response.getGeocodeAddressNonParsedResult()
.getWebServiceGeocodeQueryResults().getWebServiceGeocodeQueryResult();
List<CensusOutputRecord> censusOutputRecords = results.get(0).getCensusRecords().getCensusOutputRecord();
Assertions.assertThat(censusOutputRecords.stream().map(CensusOutputRecord::getCensusYear).collect(Collectors.toList()))
.isEqualTo(Arrays.asList(CensusYear.NINETEEN_NINETY, CensusYear.TWO_THOUSAND, CensusYear.TWO_THOUSAND_TEN));
.isEqualTo(Arrays.asList(CensusYear.NINETEEN_NINETY, CensusYear.TWO_THOUSAND,
CensusYear.TWO_THOUSAND_TEN, CensusYear.TWO_THOUSAND_TWENTY));
}

@Test
public void negativeGeocodeAddressNonParsed() {
GeocodeAddressNonParsedResponse response = GeoServices.geocodeAddressNonParsed.callSoap(new GeocodeAddressNonParsed()
GeocodeAddressNonParsedResponse response = GeoServices.geocodeAddressNonParsed
.callSoap(new GeocodeAddressNonParsed()
.withStreetAddress("9355 Burton Way")
.withCity("Beverly Hills")
.withState("ca")
Expand Down
127 changes: 127 additions & 0 deletions jdi-dark-ws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
<groupId>com.epam.jdi</groupId>
<artifactId>jdi-dark-ws</artifactId>
<name>JDI Dark WebSocket</name>
<description>Test automation framework for web service testing powered by REST Assured with WebSockets.</description>
<url>http://jdi.epam.com/</url>
<version>1.1.12</version>

<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpg.key></gpg.key>
</properties>

<build>
Expand All @@ -23,6 +26,64 @@
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>

<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<executions>
<execution>
<phase>deploy</phase>
</execution>
</executions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
<dependencies>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.15</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

Expand All @@ -43,5 +104,71 @@
<version>1.1.12</version>
</dependency>
</dependencies>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>romaniovlev</id>
<name>Roman Iovlev</name>
<email>[email protected]</email>
<timezone>UTC+3</timezone>
</developer>
</developers>

<scm>
<connection>scm:https://github.com/jdi-testing</connection>
<developerConnection>scm:https://github.com/jdi-testing</developerConnection>
<url>https://github.com/jdi-testing</url>
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<profiles>
<profile>
<id>sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>false</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<passphrase>${gpg.key}</passphrase>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
33 changes: 33 additions & 0 deletions jdi-dark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,39 @@
</plugins>
</build>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>romaniovlev</id>
<name>Roman Iovlev</name>
<email>[email protected]</email>
<timezone>UTC+3</timezone>
</developer>
</developers>

<scm>
<connection>scm:https://github.com/jdi-testing</connection>
<developerConnection>scm:https://github.com/jdi-testing</developerConnection>
<url>https://github.com/jdi-testing</url>
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<profiles>
<profile>
<id>sign-artifacts</id>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<artifactId>jdi-dark-project</artifactId>
<name>JDI Dark Project</name>
<packaging>pom</packaging>
<description>Test automation framework for web service testing powered by REST Assured.</description>
<url>http://jdi.epam.com/</url>

<properties>
<java.version>1.8</java.version>
Expand Down

0 comments on commit 593ea2e

Please sign in to comment.