1919import java .util .Arrays ;
2020import java .util .List ;
2121
22+ import com .fasterxml .jackson .databind .node .ObjectNode ;
2223import org .hamcrest .CoreMatchers ;
2324import org .junit .Assert ;
2425import org .junit .Test ;
2526
27+ import com .vaadin .flow .internal .JacksonUtils ;
2628import com .vaadin .flow .shared .Registration ;
2729
28- import elemental .json .Json ;
29- import elemental .json .JsonObject ;
30-
3130import static org .junit .Assert .assertEquals ;
3231
3332/**
@@ -50,7 +49,7 @@ public MockDataGenerator(String jsonKey, String jsonValue) {
5049 }
5150
5251 @ Override
53- public void generateData (String item , JsonObject jsonObject ) {
52+ public void generateData (String item , ObjectNode jsonObject ) {
5453 jsonObject .put (jsonKey , jsonValue );
5554 processed .add (item );
5655 }
@@ -94,12 +93,12 @@ public void generateData_innerGeneratorsAreInvoked() {
9493 composite .addDataGenerator (mock2 );
9594 composite .addDataGenerator (mock3 );
9695
97- JsonObject json = Json . createObject ();
96+ ObjectNode json = JacksonUtils . createObjectNode ();
9897 composite .generateData ("item1" , json );
9998
100- Assert .assertEquals ("value1" , json .getString ("mock1" ));
101- Assert .assertEquals ("value2" , json .getString ("mock2" ));
102- Assert .assertEquals ("value3" , json .getString ("mock3" ));
99+ Assert .assertEquals ("value1" , json .get ("mock1" ). asText ( ));
100+ Assert .assertEquals ("value2" , json .get ("mock2" ). asText ( ));
101+ Assert .assertEquals ("value3" , json .get ("mock3" ). asText ( ));
103102 Assert .assertThat (mock1 .getProcessed (), CoreMatchers .hasItem ("item1" ));
104103 Assert .assertThat (mock2 .getProcessed (), CoreMatchers .hasItem ("item1" ));
105104 Assert .assertThat (mock3 .getProcessed (), CoreMatchers .hasItem ("item1" ));
@@ -136,9 +135,9 @@ public void destroyData_innerGeneratorsAreInvoked() {
136135 composite .addDataGenerator (mock2 );
137136 composite .addDataGenerator (mock3 );
138137
139- composite .generateData ("item1" , Json . createObject ());
138+ composite .generateData ("item1" , JacksonUtils . createObjectNode ());
140139 composite .refreshData ("item1" );
141- composite .generateData ("item2" , Json . createObject ());
140+ composite .generateData ("item2" , JacksonUtils . createObjectNode ());
142141 composite .refreshData ("item2" );
143142 composite .destroyData ("item1" );
144143
@@ -165,9 +164,9 @@ public void destroyAllData_innerGeneratorsAreInvoked() {
165164 composite .addDataGenerator (mock2 );
166165 composite .addDataGenerator (mock3 );
167166
168- composite .generateData ("item1" , Json . createObject ());
167+ composite .generateData ("item1" , JacksonUtils . createObjectNode ());
169168 composite .refreshData ("item1" );
170- composite .generateData ("item2" , Json . createObject ());
169+ composite .generateData ("item2" , JacksonUtils . createObjectNode ());
171170 composite .refreshData ("item2" );
172171 composite .destroyAllData ();
173172
@@ -185,7 +184,7 @@ public void dataGeneratorRegistration_remove_dataIsDestroyed() {
185184 Registration registration1 = composite .addDataGenerator (mock1 );
186185 Registration registration2 = composite .addDataGenerator (mock2 );
187186
188- composite .generateData ("item1" , Json . createObject ());
187+ composite .generateData ("item1" , JacksonUtils . createObjectNode ());
189188 Assert .assertThat (mock1 .getProcessed (), CoreMatchers .hasItem ("item1" ));
190189 Assert .assertThat (mock2 .getProcessed (), CoreMatchers .hasItem ("item1" ));
191190
@@ -202,9 +201,9 @@ public void dataGeneratorRegistration_remove_dataIsDestroyed() {
202201 @ Test
203202 public void addDataGenerator_orderIsPreserved () {
204203 CompositeDataGenerator <String > cdg = new CompositeDataGenerator <>();
205- DataGenerator <String > dg1 = (String , JsonObject ) -> {
204+ DataGenerator <String > dg1 = (String , ObjectNode ) -> {
206205 };
207- DataGenerator <String > dg2 = (String , JsonObject ) -> {
206+ DataGenerator <String > dg2 = (String , ObjectNode ) -> {
208207 };
209208 List <DataGenerator <String >> expected = Arrays .asList (dg1 , dg2 );
210209 cdg .addDataGenerator (dg1 );
0 commit comments