Skip to content

Commit dc993c3

Browse files
authored
Fix tests (#389)
1 parent 0a22d10 commit dc993c3

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,23 @@ jobs:
2525
gradlewSuffix: .bat
2626
runs-on: ${{ matrix.os }}-latest
2727
steps:
28-
- name: Install Go
29-
uses: actions/setup-go@v4
30-
with:
31-
go-version: 1.20.x
32-
cache: false
3328
- name: Checkout code
3429
uses: actions/checkout@v4
3530
with:
3631
ref: ${{ github.event.pull_request.head.sha }}
37-
- name: Setup Artifactory
38-
run: |
39-
go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest
40-
~/go/bin/local-rt-setup
41-
env:
42-
RTLIC: ${{secrets.RTLIC}}
43-
GOPROXY: direct
32+
- name: Setup Go with cache
33+
uses: jfrog/.github/actions/install-go-with-cache@main
34+
35+
- name: Install local Artifactory
36+
uses: jfrog/.github/actions/install-local-artifactory@main
37+
with:
38+
RTLIC: ${{ secrets.RTLIC }}
4439

4540
- name: Install Java
46-
uses: actions/setup-java@v3
41+
uses: actions/setup-java@v4
4742
with:
4843
java-version: "8"
49-
distribution: "temurin"
44+
distribution: "zulu"
5045

5146
- name: Run tests
5247
run: ./gradlew${{ matrix.gradlewSuffix }} clean test

services/src/test/groovy/org/jfrog/artifactory/client/BowerPackageTypeRepositoryTests.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ class BowerPackageTypeRepositoryTests extends BaseRepositoryTests {
122122
assertThat(vcsType, CoreMatchers.is(expectedSettings.getVcsType()))
123123

124124
// virtual
125-
assertFalse(externalDependenciesEnabled)
126-
assertThat(externalDependenciesPatterns, CoreMatchers.nullValue())
127-
assertThat(externalDependenciesRemoteRepo, CoreMatchers.nullValue())
125+
assertThat(externalDependenciesEnabled, CoreMatchers.is(expectedSettings.getExternalDependenciesEnabled()))
126+
assertThat(externalDependenciesPatterns, CoreMatchers.is(expectedSettings.getExternalDependenciesPatterns()))
127+
assertThat(externalDependenciesRemoteRepo, CoreMatchers.is(expectedSettings.getExternalDependenciesRemoteRepo()))
128128
}
129129
}
130130

services/src/test/java/org/jfrog/artifactory/client/SecurityTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,10 @@ public void testGetPermissionTarget() {
103103
PermissionTarget permissionTarget = artifactory.security().permissionTarget("Anything");
104104
assertEquals("Anything", permissionTarget.getName());
105105
assertTrue(permissionTarget.getIncludesPattern().contains("**"));
106-
assertTrue(permissionTarget.getRepositories().size() > 0);
106+
assertFalse(permissionTarget.getRepositories().isEmpty());
107+
assertEquals("ANY", permissionTarget.getRepositories().get(0));
107108
assertNotNull(permissionTarget.getPrincipals());
108109
assertNotNull(permissionTarget.getPrincipals().getUsers());
109-
final String user = permissionTarget.getPrincipals().getUsers().get(0).getName();
110-
assertFalse(permissionTarget.getPrincipals().getUser(user).getPrivileges().contains(Privilege.ADMIN));
111-
assertFalse(permissionTarget.getPrincipals().getUser(user).getPrivileges().contains(Privilege.DELETE));
112-
assertTrue(permissionTarget.getPrincipals().getUser(user).getPrivileges().contains(Privilege.READ));
113110
assertNotNull(permissionTarget.getPrincipals().getGroups());
114111
}
115112

0 commit comments

Comments
 (0)