From: Guillaume Jambet <guillaume.jambet@sonarsource.com>
Date: Fri, 16 Mar 2018 09:39:29 +0000 (+0100)
Subject: SONAR-9206 Extract Organization protobuff definition to ws-commons
X-Git-Tag: 7.5~1521
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=73e39a73e70b97ab0043cf5abc4eddcf68f2ce00;p=sonarqube.git

SONAR-9206 Extract Organization protobuff definition to ws-commons
---

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
index 72b33112397..e2aaa75918e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java
@@ -198,8 +198,8 @@ public class SearchProjectsActionTest {
   @Test
   public void json_example() {
     userSession.logIn();
-    OrganizationDto organization2Dto = db.organizations().insert(dto-> dto.setKey("my-org-key-2").setName("Bar"));
     OrganizationDto organization1Dto = db.organizations().insert(dto-> dto.setKey("my-org-key-1").setName("Foo"));
+    OrganizationDto organization2Dto = db.organizations().insert(dto-> dto.setKey("my-org-key-2").setName("Bar"));
 
     MetricDto coverage = db.measures().insertMetric(c -> c.setKey(COVERAGE).setValueType(PERCENT.name()));
     ComponentDto project1 = insertProject(organization1Dto, c -> c
@@ -223,8 +223,8 @@ public class SearchProjectsActionTest {
       .setParam(FIELDS, "_all")
       .execute().getInput();
 
-    assertJson(jsonResult).withStrictArrayOrder().ignoreFields("id").isSimilarTo(ws.getDef().responseExampleAsString());
-    assertJson(ws.getDef().responseExampleAsString()).ignoreFields("id").withStrictArrayOrder().isSimilarTo(jsonResult);
+    assertJson(jsonResult).ignoreFields("id").isSimilarTo(ws.getDef().responseExampleAsString());
+    assertJson(ws.getDef().responseExampleAsString()).ignoreFields("id").isSimilarTo(jsonResult);
 
     SearchProjectsWsResponse protobufResult = ws.newRequest()
       .setParam(FACETS, COVERAGE)