Skip to content

Commit 98e3494

Browse files
Sramcikihrasko
Sramcik
authored and
ihrasko
committed
Migrate /subscription tests to shared AbstractIT
Migrate AbstractNotificationSubscriptionTest to use new AbstractIT. Logic covered by AbstractIT is removed and only /subscription specific logic remains. InvokeRequest method in subscription test used swaped order of content and accept type parameters, so in its usages they are swaped after migration. JIRA: NETCONF-1646 Change-Id: I218c2c68947a564bb72b36a726b779edb225cdc6 Signed-off-by: Matej Sramcik <matej.sramcik@pantheon.tech>
1 parent 3812499 commit 98e3494

11 files changed

Lines changed: 58 additions & 305 deletions

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/AbstractNotificationSubscriptionTest.java‎

Lines changed: 27 additions & 274 deletions
Large diffs are not rendered by default.

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/CountersSubscriptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void excludedCounterNotificationTest() throws Exception {
153153
}
154154

155155
private static void assertCounter(final FullHttpResponse response, final String sent, final String excluded) {
156-
final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION)
156+
final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), jsonParserConfiguration())
157157
.getJSONObject("ietf-subscribed-notifications:receivers")
158158
//there is only one receiver
159159
.getJSONArray("receiver").getJSONObject(0);

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/FilterWritingTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,26 @@ static void setUp() {
5757
@Test
5858
void writeJsonSubtreeFilterTest() throws Exception {
5959
final var postFilterResponse = invokeRequest(HttpMethod.POST, URI, MediaTypes.APPLICATION_YANG_DATA_JSON,
60-
FILTER_JSON, MediaTypes.APPLICATION_YANG_DATA_JSON);
60+
MediaTypes.APPLICATION_YANG_DATA_JSON, FILTER_JSON);
6161
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
6262
}
6363

6464
@Test
6565
void writeXmlSubtreeFilterTest() throws Exception {
6666
final var postFilterResponse = invokeRequest(HttpMethod.POST, URI, MediaTypes.APPLICATION_YANG_DATA_XML,
67-
FILTER_XML, MediaTypes.APPLICATION_YANG_DATA_JSON);
67+
MediaTypes.APPLICATION_YANG_DATA_JSON, FILTER_XML);
6868
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
6969
}
7070

7171
@Disabled("FIXME fails to parse JSON anydata")
7272
@Test
7373
void writeJsonReadJsonSubtreeFilterTest() throws Exception {
7474
final var postFilterResponse = invokeRequest(HttpMethod.POST, URI, MediaTypes.APPLICATION_YANG_DATA_JSON,
75-
FILTER_JSON, MediaTypes.APPLICATION_YANG_DATA_JSON);
75+
MediaTypes.APPLICATION_YANG_DATA_JSON, FILTER_JSON);
7676
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
7777

7878
final var getFilterResponse = invokeRequest(HttpMethod.GET, URI_GET, MediaTypes.APPLICATION_YANG_DATA_JSON,
79-
null, MediaTypes.APPLICATION_YANG_DATA_JSON);
79+
MediaTypes.APPLICATION_YANG_DATA_JSON, null);
8080
final var result = getFilterResponse.content().toString(StandardCharsets.UTF_8);
8181
assertEquals(HttpResponseStatus.OK, getFilterResponse.status());
8282
JSONAssert.assertEquals(EXPECTED_FILTER_JSON, result, JSONCompareMode.LENIENT);
@@ -86,11 +86,11 @@ void writeJsonReadJsonSubtreeFilterTest() throws Exception {
8686
@Test
8787
void writeJsonReadXmlSubtreeFilterTest() throws Exception {
8888
final var postFilterResponse = invokeRequest(HttpMethod.POST, URI, MediaTypes.APPLICATION_YANG_DATA_JSON,
89-
FILTER_JSON, MediaTypes.APPLICATION_YANG_DATA_JSON);
89+
MediaTypes.APPLICATION_YANG_DATA_JSON, FILTER_JSON);
9090
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
9191

92-
final var getFilterResponse = invokeRequest(HttpMethod.GET, URI_GET, MediaTypes.APPLICATION_YANG_DATA_XML, null,
93-
MediaTypes.APPLICATION_YANG_DATA_XML);
92+
final var getFilterResponse = invokeRequest(HttpMethod.GET, URI_GET, MediaTypes.APPLICATION_YANG_DATA_XML,
93+
MediaTypes.APPLICATION_YANG_DATA_XML, null);
9494
final var result = getFilterResponse.content().toString(StandardCharsets.UTF_8);
9595
assertEquals(HttpResponseStatus.OK, getFilterResponse.status());
9696
assertTrue(XMLUnit.compareXML(FILTER_XML, result).identical());
@@ -99,11 +99,11 @@ void writeJsonReadXmlSubtreeFilterTest() throws Exception {
9999
@Test
100100
void writeXmlReadJsonSubtreeFilterTest() throws Exception {
101101
final var postFilterResponse = invokeRequest(HttpMethod.POST, URI, MediaTypes.APPLICATION_YANG_DATA_XML,
102-
FILTER_XML, MediaTypes.APPLICATION_YANG_DATA_JSON);
102+
MediaTypes.APPLICATION_YANG_DATA_JSON, FILTER_XML);
103103
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
104104

105105
final var getFilterResponse = invokeRequest(HttpMethod.GET, URI_GET, MediaTypes.APPLICATION_YANG_DATA_JSON,
106-
null, MediaTypes.APPLICATION_YANG_DATA_JSON);
106+
MediaTypes.APPLICATION_YANG_DATA_JSON, null);
107107
final var result = getFilterResponse.content().toString(StandardCharsets.UTF_8);
108108
assertEquals(HttpResponseStatus.OK, getFilterResponse.status());
109109
JSONAssert.assertEquals(EXPECTED_FILTER_JSON, result, JSONCompareMode.LENIENT);
@@ -112,11 +112,11 @@ void writeXmlReadJsonSubtreeFilterTest() throws Exception {
112112
@Test
113113
void writeXmlReadXmlSubtreeFilterTest() throws Exception {
114114
final var postFilterResponse = invokeRequest(HttpMethod.POST, URI, MediaTypes.APPLICATION_YANG_DATA_XML,
115-
FILTER_XML, MediaTypes.APPLICATION_YANG_DATA_JSON);
115+
MediaTypes.APPLICATION_YANG_DATA_JSON, FILTER_XML);
116116
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
117117

118-
final var getFilterResponse = invokeRequest(HttpMethod.GET, URI_GET, MediaTypes.APPLICATION_YANG_DATA_XML, null,
119-
MediaTypes.APPLICATION_YANG_DATA_XML);
118+
final var getFilterResponse = invokeRequest(HttpMethod.GET, URI_GET, MediaTypes.APPLICATION_YANG_DATA_XML,
119+
MediaTypes.APPLICATION_YANG_DATA_XML, null);
120120
final var result = getFilterResponse.content().toString(StandardCharsets.UTF_8);
121121
assertEquals(HttpResponseStatus.OK, getFilterResponse.status());
122122
assertTrue(XMLUnit.compareXML(FILTER_XML, result).identical());

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/FilteringSubscriptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,14 @@ void filterReferenceTest() throws Exception {
142142
// create filter
143143
final var postFilterResponse = invokeRequest(HttpMethod.POST,
144144
"/rests/data/ietf-subscribed-notifications:filters",
145-
MediaTypes.APPLICATION_YANG_DATA_XML,
145+
MediaTypes.APPLICATION_YANG_DATA_XML, MediaTypes.APPLICATION_YANG_DATA_JSON,
146146
"""
147147
<stream-filter xmlns="urn:ietf:params:xml:ns:yang:ietf-subscribed-notifications">
148148
<name>foo</name>
149149
<stream-subtree-filter>
150150
<toasterOutOfBread xmlns="http://netconfcentral.org/ns/toaster"/>
151151
</stream-subtree-filter>
152-
</stream-filter>""", MediaTypes.APPLICATION_YANG_DATA_JSON);
152+
</stream-filter>""");
153153
assertEquals(HttpResponseStatus.CREATED, postFilterResponse.status());
154154

155155
// Establish subscription with filter reference

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/NotificationSubscriptionListeningTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected void beforeEach() throws Exception {
6363

6464
// Extract subscription ID from response
6565
final var jsonContent = new JSONObject(response.content().toString(StandardCharsets.UTF_8),
66-
JSON_PARSER_CONFIGURATION);
66+
jsonParserConfiguration());
6767
final var subscriptionId = jsonContent.getJSONObject("ietf-subscribed-notifications:output").getLong("id");
6868

6969
// Start listening on notifications

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/NotificationSubscriptionTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ void modifyNonExistentSubscriptionTest() throws Exception {
130130
"stop-time": "2025-03-20T15:30:00Z"
131131
}
132132
}""";
133-
final var response = invokeRequest(HttpMethod.POST, MODIFY_SUBSCRIPTION_URI, APPLICATION_JSON, input,
134-
APPLICATION_JSON);
133+
final var response = invokeRequest(HttpMethod.POST, MODIFY_SUBSCRIPTION_URI, APPLICATION_JSON,
134+
APPLICATION_JSON, input);
135135
assertEquals(HttpResponseStatus.BAD_REQUEST, response.status());
136136
}
137137

@@ -174,8 +174,8 @@ void deleteNonExistentSubscriptionTest() throws Exception {
174174
"id": 99999
175175
}
176176
}""";
177-
final var response = invokeRequest(HttpMethod.POST, DELETE_SUBSCRIPTION_URI, APPLICATION_JSON, input,
178-
APPLICATION_JSON);
177+
final var response = invokeRequest(HttpMethod.POST, DELETE_SUBSCRIPTION_URI, APPLICATION_JSON,
178+
APPLICATION_JSON, input);
179179
assertEquals(HttpResponseStatus.BAD_REQUEST, response.status());
180180
final var jsonNode = OBJECT_MAPPER.readTree(response.content().toString(StandardCharsets.UTF_8));
181181
final var errorMessage = jsonNode.at("/errors/error/0/error-message").asText();
@@ -213,8 +213,8 @@ void killNonExistentSubscriptionTest() throws Exception {
213213
"id": 99999
214214
}
215215
}""";
216-
final var response = invokeRequest(HttpMethod.POST, KILL_SUBSCRIPTION_URI, APPLICATION_JSON, input,
217-
APPLICATION_JSON);
216+
final var response = invokeRequest(HttpMethod.POST, KILL_SUBSCRIPTION_URI, APPLICATION_JSON,
217+
APPLICATION_JSON, input);
218218
assertEquals(HttpResponseStatus.BAD_REQUEST, response.status());
219219
final var jsonNode = OBJECT_MAPPER.readTree(response.content().toString(StandardCharsets.UTF_8));
220220
final var errorMessage = jsonNode.at("/errors/error/0/error-message").asText();
@@ -232,7 +232,7 @@ private FullHttpResponse establishSubscription(final String stream) throws Excep
232232
"encoding": "%s"
233233
}
234234
}""", stream, JSON_ENCODING);
235-
return invokeRequest(HttpMethod.POST, ESTABLISH_SUBSCRIPTION_URI, APPLICATION_JSON, input, APPLICATION_JSON);
235+
return invokeRequest(HttpMethod.POST, ESTABLISH_SUBSCRIPTION_URI, APPLICATION_JSON, APPLICATION_JSON, input);
236236
}
237237

238238
/**
@@ -247,7 +247,7 @@ private FullHttpResponse establishSubscriptionWithFilter(final String stream, fi
247247
%s
248248
</stream-subtree-filter>
249249
</input>""", stream, filter);
250-
return invokeRequest(HttpMethod.POST, ESTABLISH_SUBSCRIPTION_URI, APPLICATION_XML, input, APPLICATION_JSON);
250+
return invokeRequest(HttpMethod.POST, ESTABLISH_SUBSCRIPTION_URI, APPLICATION_XML, APPLICATION_JSON, input);
251251
}
252252

253253
private FullHttpRequest prepareEstablishRPCRequest() {

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/SubscriptionSuspensionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void testSubscriptionSuspension() throws Exception {
6464
final var subscriptionId = Uint32.valueOf(extractSubscriptionId(response));
6565
final var listener = startSubscriptionStream(String.valueOf(subscriptionId));
6666

67-
final var subscription = getStreamRegistry().lookupSubscription(subscriptionId);
67+
final var subscription = streamRegistry().lookupSubscription(subscriptionId);
6868
assertNotNull(subscription);
6969

7070
// try to publish ToasterRestocked notification
@@ -151,7 +151,7 @@ void testSuspendSuspendedSubscription() throws Exception {
151151
final var subscriptionId = Uint32.valueOf(extractSubscriptionId(response));
152152
final var listener = startSubscriptionStream(String.valueOf(subscriptionId));
153153

154-
final var subscription = getStreamRegistry().lookupSubscription(subscriptionId);
154+
final var subscription = streamRegistry().lookupSubscription(subscriptionId);
155155
assertNotNull(subscription);
156156

157157
// suspend subscription

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/SubscriptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void testToOperationalOutput() throws Exception {
6767
startSubscriptionStream(String.valueOf(subscriptionId));
6868
final var listener = startSubscriptionStream(String.valueOf(subscriptionId));
6969

70-
final var subscription = getStreamRegistry().lookupSubscription(subscriptionId);
70+
final var subscription = streamRegistry().lookupSubscription(subscriptionId);
7171
Assertions.assertNotNull(subscription);
7272

7373
validateToOperationalOutput(subscription, stopTime, 0);

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/http2/NotificationSubscriptionListeningHttp2Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private String startSubscription() {
149149

150150
// Extract subscription ID from response
151151
final var jsonContent = new JSONObject(response.content().toString(StandardCharsets.UTF_8),
152-
JSON_PARSER_CONFIGURATION);
152+
jsonParserConfiguration());
153153
return String.valueOf(jsonContent.getJSONObject("ietf-subscribed-notifications:output").getLong("id"));
154154
}
155155
}

‎apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/http3/AbstractNotificationSubscriptionHttp3Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected void afterEach() throws Exception {
8686
protected NettyEndpointConfiguration createEndpointConfiguration(
8787
final HttpServerListenStackGrouping serverStackGrouping) {
8888
return new NettyEndpointConfiguration(
89-
ErrorTagMapping.RFC8040, PrettyPrintParam.FALSE, Uint16.ZERO, Uint32.valueOf(1000), "rests",
89+
ErrorTagMapping.RFC8040, PrettyPrintParam.FALSE, Uint16.ZERO, Uint32.valueOf(1000), RESTS,
9090
MessageEncoding.JSON, serverStackGrouping, CHUNK_SIZE, FRAME_SIZE, WRITE_BUFFER_LOW_WATER_MARK,
9191
WRITE_BUFFER_HIGH_WATER_MARK, ALT_SVC_HEADER, HTTP3_ALT_SVC_MAX_AGE_SECONDS,
9292
new HttpServerStackConfiguration(HTTPServerOverQuic.of(localAddress(), port(), certificate, privateKey,

0 commit comments

Comments
 (0)