Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the dependency for test containers and logging format for console #49

Merged
merged 24 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
993bddc
Added the dependency for test containers and logging format for conso…
vikhyat187 Dec 2, 2023
e6e7a7a
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 3, 2023
79f7883
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 5, 2023
e23092a
Merge branch 'develop' of https://github.com/Real-Dev-Squad/skill-tre…
vikhyat187 Dec 7, 2023
fac304a
Added integration tests for /skills endpoint
vikhyat187 Dec 7, 2023
34377f2
Merge branch 'db-integration-test' of https://github.com/Real-Dev-Squ…
vikhyat187 Dec 7, 2023
77e3551
Fix: assert messages for integration tests
vikhyat187 Dec 7, 2023
79bdddd
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 9, 2023
de2962f
Used @ServiceConnection annotation for test contatiner connection con…
vikhyat187 Dec 9, 2023
690695c
Merge branch 'db-integration-test' of https://github.com/Real-Dev-Squ…
vikhyat187 Dec 9, 2023
1b77688
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 12, 2023
164e38f
Made the single test container run across multiple files
vikhyat187 Dec 12, 2023
e09dd7d
Merge branch 'develop' of https://github.com/Real-Dev-Squad/skill-tre…
vikhyat187 Dec 12, 2023
be626c3
Merge branch 'db-integration-test' of https://github.com/Real-Dev-Squ…
vikhyat187 Dec 12, 2023
8cfac2d
added mysql version 8.1 and fixed typo in the class name
vikhyat187 Dec 14, 2023
6f565e4
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 14, 2023
73131cf
added assertion on skillId and fix unit tests:
vikhyat187 Dec 16, 2023
d30cddf
Merge branch 'db-integration-test' of https://github.com/Real-Dev-Squ…
vikhyat187 Dec 16, 2023
b810e33
Update integration tests
vikhyat187 Dec 16, 2023
ddcc497
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 17, 2023
9978263
Migrate the Junit4 tests to Junit5, and excluded Junit4 dependency
vikhyat187 Dec 17, 2023
af7845d
Merge branch 'db-integration-test' of https://github.com/Real-Dev-Squ…
vikhyat187 Dec 17, 2023
a8dbcde
Resolving merge conflicts
vikhyat187 Dec 19, 2023
ce68b3e
Merge branch 'develop' into db-integration-test
vikhyat187 Dec 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions skill-tree /pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<description>skill tree project</description>
<properties>
<java.version>17</java.version>
<testcontainers.version>1.17.6</testcontainers.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -57,12 +58,33 @@
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-testcontainers</artifactId>
<scope>test</scope>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
Expand All @@ -80,4 +102,4 @@
</plugins>
</build>

</project>
</project>
1 change: 1 addition & 0 deletions skill-tree /src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
spring.datasource.username=${MYSQL_DB_USERNAME}
spring.datasource.password=${MYSQL_DB_PASSWORD}
spring.jpa.hibernate.ddl-auto=${DB_DDL_POLICY}
spring.datasource.version=8.1.0

jwt.rds.public.key = ${RDS_PUBLIC_KEY}
14 changes: 14 additions & 0 deletions skill-tree /src/main/resources/logback-test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
vikhyat187 marked this conversation as resolved.
Show resolved Hide resolved
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="info">
<appender-ref ref="STDOUT"/>
</root>
<logger name="org.testcontainers" level="INFO"/>
<logger name="com.github.dockerjava" level="WARN"/>
<logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
debanjanc01 marked this conversation as resolved.
Show resolved Hide resolved
</configuration>
Loading