Skip to content

Commit

Permalink
Use Version.CURRENT
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
cwperks committed Jul 3, 2023
1 parent d660042 commit 8c11fd9
Showing 1 changed file with 18 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,12 @@ public void testRestInitializeExtensionActionResponse() throws Exception {
ExtensionsManager extensionsManager = mock(ExtensionsManager.class);
RestInitializeExtensionAction restInitializeExtensionAction = new RestInitializeExtensionAction(extensionsManager);
final String content = "{\"name\":\"ad-extension\",\"uniqueId\":\"ad-extension\",\"hostAddress\":\"127.0.0.1\","
+ "\"port\":\"4532\",\"version\":\"1.0\",\"opensearchVersion\":\"3.0.0\","
+ "\"minimumCompatibleVersion\":\"3.0.0\"}";
+ "\"port\":\"4532\",\"version\":\"1.0\",\"opensearchVersion\":\""
+ Version.CURRENT.toString()
+ "\","
+ "\"minimumCompatibleVersion\":\""
+ Version.CURRENT.toString()
+ "\"}";
RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(content), XContentType.JSON)
.withMethod(RestRequest.Method.POST)
.build();
Expand All @@ -115,8 +119,12 @@ public void testRestInitializeExtensionActionFailure() throws Exception {
RestInitializeExtensionAction restInitializeExtensionAction = new RestInitializeExtensionAction(extensionsManager);

final String content = "{\"name\":\"ad-extension\",\"uniqueId\":\"\",\"hostAddress\":\"127.0.0.1\","
+ "\"port\":\"4532\",\"version\":\"1.0\",\"opensearchVersion\":\"3.0.0\","
+ "\"minimumCompatibleVersion\":\"3.0.0\"}";
+ "\"port\":\"4532\",\"version\":\"1.0\",\"opensearchVersion\":\""
+ Version.CURRENT.toString()
+ "\","
+ "\"minimumCompatibleVersion\":\""
+ Version.CURRENT.toString()
+ "\"}";
RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(content), XContentType.JSON)
.withMethod(RestRequest.Method.POST)
.build();
Expand Down Expand Up @@ -152,7 +160,9 @@ public void testRestInitializeExtensionActionResponseWithAdditionalSettings() th
+ "\"port\":\"4532\",\"version\":\"1.0\",\"opensearchVersion\":\""
+ Version.CURRENT.toString()
+ "\","
+ "\"minimumCompatibleVersion\":\"3.0.0\",\"boolSetting\":true,\"stringSetting\":\"customSetting\",\"intSetting\":5,\"listSetting\":[\"one\",\"two\",\"three\"]}";
+ "\"minimumCompatibleVersion\":\""
+ Version.CURRENT.toString()
+ "\",\"boolSetting\":true,\"stringSetting\":\"customSetting\",\"intSetting\":5,\"listSetting\":[\"one\",\"two\",\"three\"]}";
RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(content), XContentType.JSON)
.withMethod(RestRequest.Method.POST)
.build();
Expand Down Expand Up @@ -197,7 +207,9 @@ public void testRestInitializeExtensionActionResponseWithAdditionalSettingsUsing
+ "\"port\":\"4532\",\"version\":\"1.0\",\"opensearchVersion\":\""
+ Version.CURRENT.toString()
+ "\","
+ "\"minimumCompatibleVersion\":\"3.0.0\"}";
+ "\"minimumCompatibleVersion\":\""
+ Version.CURRENT.toString()
+ "\"}";
RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(content), XContentType.JSON)
.withMethod(RestRequest.Method.POST)
.build();
Expand Down

0 comments on commit 8c11fd9

Please sign in to comment.