This repository has been archived by the owner on Feb 7, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* PLT-1046 updated validation * fixed test
- Loading branch information
1 parent
1702867
commit 3450a11
Showing
3 changed files
with
25 additions
and
28 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
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 |
---|---|---|
|
@@ -24,9 +24,9 @@ | |
import java.util.HashMap; | ||
import java.util.Map; | ||
|
||
import static oap.http.Http.StatusCode.BAD_REQUEST; | ||
import static oap.http.Http.StatusCode.FORBIDDEN; | ||
import static oap.http.Http.StatusCode.NOT_FOUND; | ||
import static oap.http.Http.StatusCode.NO_CONTENT; | ||
import static oap.http.Http.StatusCode.OK; | ||
import static oap.http.testng.HttpAsserts.assertGet; | ||
import static oap.http.testng.HttpAsserts.assertPost; | ||
|
@@ -539,14 +539,10 @@ public void changeDefaultAccountUser() { | |
@Test | ||
public void setTheSameDefaultAccountToUser() { | ||
OrganizationData org1 = accountFixture.accounts().storeOrganization( new Organization( "First", "test" ) ); | ||
OrganizationData org2 = accountFixture.accounts().storeOrganization( new Organization( "Second", "test" ) ); | ||
final String orgId = org1.organization.id; | ||
accountFixture.accounts().storeAccount( orgId, new Account( "acc1", "acc1" ) ); | ||
accountFixture.accounts().storeAccount( orgId, new Account( "acc2", "acc2" ) ); | ||
|
||
accountFixture.accounts().storeAccount( org2.organization.id, new Account( "acc3", "acc3" ) ); | ||
accountFixture.accounts().storeAccount( org2.organization.id, new Account( "acc4", "acc4" ) ); | ||
|
||
final String mail = "[email protected]"; | ||
UserData user = new UserData( new User( mail, "John", "Smith", "pass123", true ), Map.of( orgId, USER ) ); | ||
user.addAccount( orgId, "acc1" ); | ||
|
@@ -556,7 +552,7 @@ public void setTheSameDefaultAccountToUser() { | |
assertEquals( "acc1", accountFixture.userStorage().getUser( mail ).get().getDefaultAccount( orgId ).get() ); | ||
accountFixture.assertLogin( "[email protected]", "pass123" ); | ||
assertGet( accountFixture.httpUrl( "/organizations/" + orgId + "/users/" + mail + "/default-account/acc2" ) ).hasCode( OK ); | ||
assertGet( accountFixture.httpUrl( "/organizations/" + orgId + "/users/" + mail + "/default-account/acc2" ) ).hasCode( NO_CONTENT ); | ||
assertGet( accountFixture.httpUrl( "/organizations/" + orgId + "/users/" + mail + "/default-account/acc2" ) ).hasCode( BAD_REQUEST ); | ||
assertEquals( "acc2", accountFixture.userStorage().getUser( mail ).get().getDefaultAccount( orgId ).get() ); | ||
} | ||
|
||
|
@@ -576,7 +572,7 @@ public void setAccountToNonExistingUser() { | |
} | ||
|
||
@Test | ||
public void setNonExistentDefaultAccountToUser() { | ||
public void setNonExistingDefaultAccountToUser() { | ||
OrganizationData org1 = accountFixture.accounts().storeOrganization( new Organization( "First", "test" ) ); | ||
final String orgId = org1.organization.id; | ||
accountFixture.accounts().storeAccount( orgId, new Account( "acc1", "acc1" ) ); | ||
|
@@ -640,7 +636,7 @@ public void addOrganizationToUserByAdminInSeveralOrganizations() { | |
} | ||
|
||
@Test | ||
public void addOrganizationToUserByUserWithDIfferentRolesInOrganizations() { | ||
public void addOrganizationToUserByUserWithDifferentRolesInOrganizations() { | ||
OrganizationData org1 = accountFixture.accounts().storeOrganization( new Organization( "First", "test" ) ); | ||
OrganizationData org2 = accountFixture.accounts().storeOrganization( new Organization( "Second", "test" ) ); | ||
|
||
|
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