forked from citrusframework/citrus-simulator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main'
# Conflicts: # simulator-ui/src/main/webapp/app/entities/message-header/detail/message-header-detail.component.html # simulator-ui/src/main/webapp/app/entities/message-header/list/message-header-table.component.html # simulator-ui/src/main/webapp/app/entities/message-header/list/message-header.component.html # simulator-ui/src/main/webapp/app/entities/message/detail/message-detail.component.html # simulator-ui/src/main/webapp/app/entities/message/list/message.component.html # simulator-ui/src/main/webapp/app/entities/scenario-action/detail/scenario-action-detail.component.html # simulator-ui/src/main/webapp/app/entities/scenario-action/list/scenario-action.component.html # simulator-ui/src/main/webapp/app/entities/scenario-execution/detail/scenario-actions-table.component.html # simulator-ui/src/main/webapp/app/entities/scenario-execution/detail/scenario-messages-table.component.html # simulator-ui/src/main/webapp/app/entities/scenario-execution/detail/scenario-parameters-table.component.html # simulator-ui/src/main/webapp/app/entities/scenario-execution/list/scenario-execution.component.html # simulator-ui/src/main/webapp/app/entities/scenario-execution/list/scenario-execution.component.scss # simulator-ui/src/main/webapp/app/entities/scenario-parameter/detail/scenario-parameter-detail.component.html # simulator-ui/src/main/webapp/app/entities/scenario-parameter/list/scenario-parameter.component.html # simulator-ui/src/main/webapp/app/entities/test-parameter/detail/test-parameter-detail.component.html # simulator-ui/src/main/webapp/app/entities/test-parameter/list/test-parameter.component.html # simulator-ui/src/main/webapp/app/entities/test-result/detail/test-result-detail.component.html # simulator-ui/src/main/webapp/app/entities/test-result/list/test-result.component.html # simulator-ui/src/main/webapp/app/home/test-result-summary.component.html # simulator-ui/src/main/webapp/app/layouts/navbar/navbar.component.html # simulator-ui/src/main/webapp/app/scenario-result/filter/header-filter-dialog.component.html # simulator-ui/src/main/webapp/app/scenario-result/filter/scenario-execution-filter.component.html # simulator-ui/src/main/webapp/app/scenario-result/scenario-result.component.html # simulator-ui/src/main/webapp/app/scenario/detail/scenario-detail.component.html # simulator-ui/src/main/webapp/app/scenario/list/scenario.component.html # simulator-ui/src/main/webapp/app/shared/alert/alert-error.component.html # simulator-ui/src/main/webapp/app/shared/alert/alert.component.html # simulator-ui/src/main/webapp/app/shared/filter/filter.component.html # simulator-ui/src/main/webapp/app/shared/pagination/select-page-size.component.html # simulator-ui/src/main/webapp/content/scss/global.scss
- Loading branch information
Showing
60 changed files
with
9,014 additions
and
10,260 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: Citrus Simulator | ||
| release: | ||
| current-version: 3.0.0 | ||
| current-version: 3.0.1 | ||
| next-version: 3.1.0-SNAPSHOT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # --------------------------------------------------------------------------- | ||
| # Copyright the original author or authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # --------------------------------------------------------------------------- | ||
|
|
||
| name: nightly | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| - cron: "0 0 * * *" | ||
|
|
||
| jobs: | ||
| nightly: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Cache Maven cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ~/.m2 | ||
| key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: ${{ runner.os }}-m2 | ||
| - name: Info | ||
| run: | | ||
| java -version | ||
| ./mvnw -version | ||
| - name: Simulator Dependency Report | ||
| run: | | ||
| ./mvnw --no-transfer-progress versions:display-dependency-updates |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ target | |
| .classpath | ||
| .settings | ||
| .idea | ||
| .vscode | ||
| .DS_Store | ||
| *.iml | ||
| *.ipr | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...ring-boot/src/test/java/org/citrusframework/simulator/model/AbstractAuditingEntityIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package org.citrusframework.simulator.model; | ||
|
|
||
| import org.assertj.core.data.TemporalUnitLessThanOffset; | ||
| import org.citrusframework.simulator.common.TimeProvider; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static java.time.temporal.ChronoUnit.SECONDS; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class AbstractAuditingEntityIT { | ||
|
|
||
| public static final TemporalUnitLessThanOffset LESS_THAN_1_SECOND = new TemporalUnitLessThanOffset(1, SECONDS); | ||
|
|
||
| AuditedEntity fixture; | ||
|
|
||
| @BeforeEach | ||
| void setup() { | ||
| fixture = new AuditedEntity(); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldUseCorrectTime() { | ||
| var timeProvider = new TimeProvider(); | ||
| assertThat(fixture.getCreatedDate()).isCloseTo(timeProvider.getTimeNow(), LESS_THAN_1_SECOND); | ||
| assertThat(fixture.getLastModifiedDate()).isCloseTo(timeProvider.getTimeNow(), LESS_THAN_1_SECOND); | ||
| } | ||
|
|
||
| private static class AuditedEntity extends AbstractAuditingEntity<AuditedEntity, Long> { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.