Skip to content

Commit 49c75d9

Browse files
splatchsplatch
committed
Switch integration tests to test containers.
Several changes coming along the way: 1) Removal of pax-exam classes 2) Introduction of test runner bassed on test containers 3) Restructuring of offline installation tests 4) Adjustments of dbus features to avoid refreshing of system core upon installation. 5) Enable test coverage reporting through jacoco Signed-off-by: Łukasz Dywicki <[email protected]>
1 parent bd6eccc commit 49c75d9

File tree

54 files changed

+8143
-1893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+8143
-1893
lines changed

‎.github/workflows/maven.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88

99
jobs:
1010
build:
11+
permissions:
12+
checks: write
13+
contents: read
1114
strategy:
1215
matrix:
1316
java: [ 11 ]
@@ -41,9 +44,15 @@ jobs:
4144
env:
4245
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4346
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
44-
run: |
45-
mvn -B -fae clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ConnectorIO_connectorio-addons -Dsonar.organization=connectorio -Dsonar.host.url=https://sonarcloud.io
46-
47+
run: >-
48+
mvn -B -fae -nsu clean verify
49+
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
50+
-Dsonar.projectKey=ConnectorIO_connectorio-addons
51+
-Dsonar.organization=connectorio
52+
-Dsonar.host.url=https://sonarcloud.io
53+
- name: Publish Test Report
54+
if: success() || failure()
55+
uses: scacap/action-surefire-report@v1
4756
- name: Upload Test Report
4857
uses: actions/upload-artifact@v3
4958
if: success() || failure()

‎bddhab/org.connectorio.bddhab.rest/pom.xml

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
- Copyright (C) 2022-2022 ConnectorIO Sp. z o.o.
4+
-
5+
- Licensed under the Apache License, Version 2.0 (the "License");
6+
- you may not use this file except in compliance with the License.
7+
- You may obtain a copy of the License at
8+
-
9+
- http://www.apache.org/licenses/LICENSE-2.0
10+
-
11+
- Unless required by applicable law or agreed to in writing, software
12+
- distributed under the License is distributed on an "AS IS" BASIS,
13+
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
- See the License for the specific language governing permissions and
15+
- limitations under the License.
16+
-
17+
- SPDX-License-Identifier: Apache-2.0
18+
-->
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<groupId>org.connectorio.addons</groupId>
25+
<artifactId>bddhab</artifactId>
26+
<version>3.0.0-SNAPSHOT</version>
27+
</parent>
28+
29+
<groupId>org.connectorio.bddhab</groupId>
30+
<artifactId>org.connectorio.bddhab.rest</artifactId>
31+
32+
<name>ConnectorIO - BDD HAB - REST</name>
33+
<description>Client for openHAB REST Api.</description>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>com.fasterxml.jackson.core</groupId>
38+
<artifactId>jackson-annotations</artifactId>
39+
<version>2.10.3</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.fasterxml.jackson.core</groupId>
43+
<artifactId>jackson-databind</artifactId>
44+
<version>2.10.3</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.fasterxml.jackson.datatype</groupId>
48+
<artifactId>jackson-datatype-jsr310</artifactId>
49+
<version>2.10.3</version>
50+
</dependency>
51+
</dependencies>
52+
53+
<build>
54+
<plugins>
55+
<plugin>
56+
<groupId>org.openapitools</groupId>
57+
<artifactId>openapi-generator-maven-plugin</artifactId>
58+
<executions>
59+
<execution>
60+
<goals>
61+
<goal>generate</goal>
62+
</goals>
63+
</execution>
64+
</executions>
65+
<configuration>
66+
<inputSpec>${project.basedir}/src/main/openapi/openhab-openapi-3.1.x.json</inputSpec>
67+
<apiPackage>org.connectorio.bddhab.rest.client.v31</apiPackage>
68+
<modelPackage>org.connectorio.bddhab.rest.client.v31.model</modelPackage>
69+
<additionalProperties>
70+
<additionalProperty>openApiNullable=false</additionalProperty>
71+
</additionalProperties>
72+
</configuration>
73+
<dependencies>
74+
<dependency>
75+
<groupId>org.connectorio.openapi.generators</groupId>
76+
<artifactId>java-basic-native</artifactId>
77+
<version>${connectorio-openapi-generators.version}</version>
78+
</dependency>
79+
</dependencies>
80+
</plugin>
81+
<plugin>
82+
<groupId>org.codehaus.mojo</groupId>
83+
<artifactId>build-helper-maven-plugin</artifactId>
84+
<executions>
85+
<execution>
86+
<id>attach-feature-xml</id>
87+
<phase>none</phase>
88+
</execution>
89+
<execution>
90+
<id>attach-sources</id>
91+
<phase>generate-sources</phase>
92+
<goals>
93+
<goal>add-source</goal>
94+
</goals>
95+
</execution>
96+
</executions>
97+
<configuration>
98+
<sources>
99+
<source>${project.build.directory}/openapi/src/main/java</source>
100+
</sources>
101+
</configuration>
102+
</plugin>
103+
</plugins>
104+
</build>
105+
106+
</project>

0 commit comments

Comments
 (0)