Commit 3231ae27 authored by sreeragksgh's avatar sreeragksgh
Browse files

merge changes

parent ecb0e438
release-5.1.0-student-login-endpoint dependabot/maven/actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-notification/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/org.jboss.resteasy-resteasy-client-4.5.7.Final dependabot/maven/controller/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/actor-core/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/cassandra-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/notification-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/notification-utils/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/core/platform-common/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/platform-common/org.apache.kafka-kafka-clients-0.10.2.2 dependabot/maven/core/platform-common/org.jboss.resteasy-resteasy-client-3.14.0.Final dependabot/maven/core/sunbird-notification/com.fasterxml.jackson.core-jackson-databind-2.9.10.7 dependabot/maven/core/sunbird-notification/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/junit-junit-4.13.1 helmchart master patch-1 patch-2 release-4.0.0 release-4.1.0 release-4.10.0 release-4.10.1 release-4.2.0 release-4.3.0 release-4.4.0 release-4.4.1 release-4.5.0 release-4.6.0 release-4.7.0 release-4.9.0 release-5.0.0 release-5.0.1 release-5.0.2 release-5.1.0 release-5.0.1_RC1 release-5.0.0_RC5 release-5.0.0_RC4 release-5.0.0_RC3 release-5.0.0_RC2 release-5.0.0_RC1 release-4.10.1_RC1 release-4.10.0_RC5 release-4.10.0_RC4 release-4.10.0_RC3 release-4.10.0_RC2 release-4.10.0_RC1 release-4.9.0_RC3 release-4.9.0_RC2 release-4.9.0_RC1 release-4.7.0_RC11 release-4.7.0_RC10 release-4.7.0_RC9 release-4.7.0_RC8 release-4.7.0_RC7 release-4.7.0_RC6 release-4.7.0_RC5 release-4.7.0_RC4 release-4.7.0_RC3 release-4.7.0_RC2 release-4.7.0_RC1 release-4.6.0_RC9 release-4.6.0_RC8 release-4.6.0_RC7 release-4.6.0_RC6 release-4.6.0_RC5 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0_RC14 release-4.5.0_RC13 release-4.5.0_RC12 release-4.5.0_RC11 release-4.5.0_RC10 release-4.5.0_RC9 release-4.5.0_RC8 release-4.5.0_RC7 release-4.5.0_RC6 release-4.5.0_RC5 release-4.5.0_RC4 release-4.5.0_RC3 release-4.5.0_RC2 release-4.5.0_RC1 release-4.4.1_RC1 release-4.4.0_RC15 release-4.4.0_RC14 release-4.4.0_RC13 release-4.4.0_RC12 release-4.4.0_RC11 release-4.4.0_RC10 release-4.4.0_RC9 release-4.4.0_RC8 release-4.4.0_RC7 release-4.4.0_RC6 release-4.4.0_RC5 release-4.4.0_RC4 release-4.4.0_RC3 release-4.4.0_RC2 release-4.4.0_RC1 release-4.3.0_RC16 release-4.3.0_RC15 release-4.3.0_RC14 release-4.3.0_RC13 release-4.3.0_RC12 release-4.3.0_RC11 release-4.3.0_RC10 release-4.3.0_RC9 release-4.3.0_RC8 release-4.3.0_RC7 release-4.3.0_RC6 release-4.3.0_RC5 release-4.3.0_RC4 release-4.3.0_RC3 release-4.3.0_RC2 release-4.3.0_RC1 release-4.2.0_RC13 release-4.2.0_RC12 release-4.2.0_RC11 release-4.2.0_RC10 release-4.2.0_RC9 release-4.2.0_RC8 release-4.2.0_RC7 release-4.2.0_RC6 release-4.2.0_RC5 release-4.2.0_RC4 release-4.2.0_RC3 release-4.2.0_RC2 release-4.2.0_RC1 release-4.1.0_RC16 release-4.1.0_RC15 release-4.1.0_RC14 release-4.1.0_RC13 release-4.1.0_RC12 release-4.1.0_RC11 release-4.1.0_RC10 release-4.1.0_RC9 release-4.1.0_RC8 release-4.1.0_RC7 release-4.1.0_RC6 release-4.1.0_RC5 release-4.1.0_RC4 release-4.1.0_RC3 release-4.1.0_RC2 release-4.1.0_RC1 release-4.0.0_RC18 release-4.0.0_RC17 release-4.0.0_RC16 release-4.0.0_RC15 release-4.0.0_RC14 release-4.0.0_RC13 release-4.0.0_RC12 release-4.0.0_RC11 release-4.0.0_RC10 release-4.0.0_RC9 release-4.0.0_RC8 release-4.0.0_RC7 release-4.0.0_RC6 release-4.0.0_RC5 release-4.0.0_RC4 release-4.0.0_RC3 release-4.0.0_RC2 release-4.0.0_RC1
No related merge requests found
Showing with 21 additions and 0 deletions
+21 -0
......@@ -109,6 +109,20 @@ public class UtilTest {
Assert.assertNotNull(bool);
}
@Test
public void testRegisterUserToOrg() {
Map<String, Object> map = new HashMap<>();
map.put(JsonKey.ID, "123456");
map.put(JsonKey.USER_ID, "123456");
map.put(JsonKey.ORGANISATION_ID, "123456");
map.put(JsonKey.IS_DELETED, false);
map.put(JsonKey.ASSOCIATION_TYPE, "1");
Response response = new Response();
when(cassandraOperationImpl.insertRecord(JsonKey.SUNBIRD, "user_organisation", map, null))
.thenReturn(response);
Assert.assertNotNull(response);
}
public static Map<String, Object> getEsResponseMap() {
Map<String, Object> map = new HashMap<>();
map.put(JsonKey.IS_TENANT, true);
......
......@@ -43,4 +43,11 @@ public class AssociationMechanismTest {
associationMechanism.removeAssociationType(AssociationMechanism.SELF_DECLARATION);
Assert.assertEquals(1, associationMechanism.getAssociationType());
}
@Test
public void setAssociationTypeTest() {
AssociationMechanism associationMechanism = new AssociationMechanism();
associationMechanism.setAssociationType(1);
Assert.assertEquals(associationMechanism.SSO, associationMechanism.getAssociationType());
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment