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

G5V8DT-24042 Починить все тесты, падающие в публичных плагинах #112

Merged
merged 15 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1e9d2b5
G5V8DT-24042 Починить все тесты, падающие в публичных плагинах
MaksimDzyuba Sep 10, 2024
866d6f2
G5V8DT-24042 fix build-ci
MaksimDzyuba Sep 10, 2024
aa62acf
Включен режим verbose у maven в build.yml
tretyakevich Sep 16, 2024
3ba7952
G5V8DT-24042: Исправлено ожидание билда изменных ресурсов
Sep 16, 2024
4769937
Update build.yml
tretyakevich Sep 16, 2024
a1dd184
G5V8DT-24042: Запуск тестов в одном потоке
Sep 17, 2024
0ceb667
Merge branch 'G5V8DT-24042' of github.com:1C-Company/ssl-support into…
Sep 17, 2024
5f4bbcd
G5V8DT-24042: Тестирование переносов тестовых артефактов
Sep 17, 2024
75ae567
G5V8DT-24042: Тестирование переносов тестовых артефактов
Sep 17, 2024
066d8b7
Merge branch 'edt-2024-2' into G5V8DT-24042
tretyakevich Sep 17, 2024
49402b7
G5V8DT-24042: Явно добавлена 19-я платформа в таргет
Sep 17, 2024
87b0b47
Merge branch 'G5V8DT-24042' of github.com:1C-Company/ssl-support into…
Sep 17, 2024
bb6df94
G5V8DT-24042: Добавлен флаг отключения контроля среды в тесты
Sep 26, 2024
c4ba859
G5V8DT-25727 Возникает NPE во время расширенных проверок после импорта
MaksimDzyuba Oct 8, 2024
8b9f523
G5V8DT-24042 Починить все тесты, падающие в публичных плагинах
MaksimDzyuba Oct 8, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
Xvfb :5 -screen 0 1280x1024x8 -fbdir /tmp &
export DISPLAY=:5
echo "Sonar param: \"${SONAR_PARAM}\""
mvn clean verify ${SONAR_PARAM} -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -B -V -X 1C
mvn clean verify ${SONAR_PARAM} -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -X -B -V 1C

- name: Publish Test Report
uses: scacap/action-surefire-report@v1
Expand All @@ -79,19 +79,19 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload repo
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ssl-support-repository
path: repositories/com.e1c.ssl.repository/target/repository/

- name: Upload SDK repo
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ssl-support-repository-sdk
path: repositories/com.e1c.ssl.repository.sdk/target/repository/

- name: Upload JaCoCo exec data
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: jacoco
Expand All @@ -100,7 +100,7 @@ jobs:
./**/target/site/jacoco*/

- name: Upload test logs on failure
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: logs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,18 @@ public TypeItem transformArray(TypeItem type, EObject context, boolean transform
return type;
}

if (type.eIsProxy())
{
type = (TypeItem)EcoreUtil.resolve(type, context);
if (type.eIsProxy())
{
return type;
}
}
if (!(type instanceof Type))
{
return type;
}

Type arrayType = (Type)type;

Expand Down Expand Up @@ -199,6 +209,14 @@ public TypeItem transformMap(TypeItem type, EObject context, boolean transformTo

if (!(type instanceof Type))
return type;
if (type.eIsProxy())
{
type = (TypeItem)EcoreUtil.resolve(type, context);
if (type.eIsProxy())
{
return type;
}
}

Type mapType = (Type)type;
Type collectionType = (Type)mapType.getCollectionElementTypes().allTypes().get(0);
Expand Down
Loading
Loading