Skip to content

Commit c91a970

Browse files
committed
fix line endings
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 0337e34 commit c91a970

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

client/src/test/java/org/apache/cloudstack/ShareSignedUrlFilterTest.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,98 +39,98 @@ public void allowsRequestWhenTokenIsNotRequiredAndParametersAreMissing() throws
3939
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
4040
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
4141
FilterChain mockChain = mock(FilterChain.class);
42-
42+
4343
when(mockRequest.getParameter("exp")).thenReturn(null);
4444
when(mockRequest.getParameter("sig")).thenReturn(null);
45-
45+
4646
filter.doFilter(mockRequest, mockResponse, mockChain);
47-
47+
4848
verify(mockChain).doFilter(mockRequest, mockResponse);
4949
}
50-
50+
5151
@Test
5252
public void deniesRequestWhenTokenIsRequiredAndParametersAreMissing() throws Exception {
5353
ShareSignedUrlFilter filter = new ShareSignedUrlFilter(true, "secret");
5454
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
5555
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
5656
FilterChain mockChain = mock(FilterChain.class);
57-
57+
5858
when(mockRequest.getParameter("exp")).thenReturn(null);
5959
when(mockRequest.getParameter("sig")).thenReturn(null);
60-
60+
6161
filter.doFilter(mockRequest, mockResponse, mockChain);
62-
62+
6363
verify(mockResponse).sendError(HttpServletResponse.SC_FORBIDDEN, "Missing token");
6464
verifyNoInteractions(mockChain);
6565
}
66-
66+
6767
@Test
6868
public void deniesRequestWhenExpirationIsInvalid() throws Exception {
6969
ShareSignedUrlFilter filter = new ShareSignedUrlFilter(true, "secret");
7070
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
7171
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
7272
FilterChain mockChain = mock(FilterChain.class);
73-
73+
7474
when(mockRequest.getParameter("exp")).thenReturn("invalid");
7575
when(mockRequest.getParameter("sig")).thenReturn("signature");
76-
76+
7777
filter.doFilter(mockRequest, mockResponse, mockChain);
78-
78+
7979
verify(mockResponse).sendError(HttpServletResponse.SC_FORBIDDEN, "Bad exp");
8080
verifyNoInteractions(mockChain);
8181
}
82-
82+
8383
@Test
8484
public void deniesRequestWhenTokenIsExpired() throws Exception {
8585
ShareSignedUrlFilter filter = new ShareSignedUrlFilter(true, "secret");
8686
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
8787
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
8888
FilterChain mockChain = mock(FilterChain.class);
89-
89+
9090
when(mockRequest.getParameter("exp")).thenReturn(String.valueOf(Instant.now().getEpochSecond() - 10));
9191
when(mockRequest.getParameter("sig")).thenReturn("signature");
92-
92+
9393
filter.doFilter(mockRequest, mockResponse, mockChain);
94-
94+
9595
verify(mockResponse).sendError(HttpServletResponse.SC_FORBIDDEN, "Token expired");
9696
verifyNoInteractions(mockChain);
9797
}
98-
98+
9999
@Test
100100
public void deniesRequestWhenSignatureIsInvalid() throws Exception {
101101
ShareSignedUrlFilter filter = new ShareSignedUrlFilter(true, "secret");
102102
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
103103
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
104104
FilterChain mockChain = mock(FilterChain.class);
105-
105+
106106
when(mockRequest.getParameter("exp")).thenReturn(String.valueOf(Instant.now().getEpochSecond() + 1000));
107107
when(mockRequest.getParameter("sig")).thenReturn("invalidSignature");
108108
when(mockRequest.getRequestURI()).thenReturn("/share/resource");
109-
109+
110110
filter.doFilter(mockRequest, mockResponse, mockChain);
111-
111+
112112
verify(mockResponse).sendError(HttpServletResponse.SC_FORBIDDEN, "Bad signature");
113113
verifyNoInteractions(mockChain);
114114
}
115-
115+
116116
@Test
117117
public void allowsRequestWhenSignatureIsValid() throws Exception {
118118
String secret = "secret";
119119
ShareSignedUrlFilter filter = new ShareSignedUrlFilter(true, secret);
120120
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
121121
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
122122
FilterChain mockChain = mock(FilterChain.class);
123-
123+
124124
String exp = String.valueOf(Instant.now().getEpochSecond() + 1000);
125125
String data = "/share/resource|" + exp;
126126
String validSignature = HMACSignUtil.generateSignature(data, secret);
127-
127+
128128
when(mockRequest.getParameter("exp")).thenReturn(exp);
129129
when(mockRequest.getParameter("sig")).thenReturn(validSignature);
130130
when(mockRequest.getRequestURI()).thenReturn("/share/resource");
131-
131+
132132
filter.doFilter(mockRequest, mockResponse, mockChain);
133-
133+
134134
verify(mockChain).doFilter(mockRequest, mockResponse);
135135
}
136136
}

framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/SyncExtensionCmdTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,78 +43,78 @@ public void returnsIdWhenGetIdIsCalled() {
4343
ReflectionTestUtils.setField(cmd, "id", 123L);
4444
assertEquals(Long.valueOf(123), cmd.getId());
4545
}
46-
46+
4747
@Test
4848
public void returnsSourceManagementServerIdWhenGetSourceManagementServerIdIsCalled() {
4949
SyncExtensionCmd cmd = new SyncExtensionCmd();
5050
ReflectionTestUtils.setField(cmd, "sourceManagementServerId", 456L);
5151
assertEquals(Long.valueOf(456), cmd.getSourceManagementServerId());
5252
}
53-
53+
5454
@Test
5555
public void returnsTargetManagementServerIdsWhenGetTargetManagementServerIdsIsCalled() {
5656
SyncExtensionCmd cmd = new SyncExtensionCmd();
5757
List<Long> targetIds = Arrays.asList(789L, 101L);
5858
ReflectionTestUtils.setField(cmd, "targetManagementServerIds", targetIds);
5959
assertEquals(targetIds, cmd.getTargetManagementServerIds());
6060
}
61-
61+
6262
@Test
6363
public void returnsFilesWhenGetFilesIsCalled() {
6464
SyncExtensionCmd cmd = new SyncExtensionCmd();
6565
List<String> files = Arrays.asList("file1.txt", "file2.txt");
6666
ReflectionTestUtils.setField(cmd, "files", files);
6767
assertEquals(files, cmd.getFiles());
6868
}
69-
69+
7070
@Test
7171
public void executesSuccessfullyWhenSyncExtensionSucceeds() throws Exception {
7272
SyncExtensionCmd cmd = new SyncExtensionCmd();
7373
ExtensionsManager mockManager = mock(ExtensionsManager.class);
7474
ReflectionTestUtils.setField(cmd, "extensionsManager", mockManager);
7575
when(mockManager.syncExtension(cmd)).thenReturn(true);
76-
76+
7777
cmd.execute();
78-
78+
7979
SuccessResponse response = (SuccessResponse) cmd.getResponseObject();
8080
assertTrue(response.getSuccess());
8181
}
82-
82+
8383
@Test(expected = ServerApiException.class)
8484
public void throwsExceptionWhenSyncExtensionFails() throws Exception {
8585
SyncExtensionCmd cmd = new SyncExtensionCmd();
8686
ExtensionsManager mockManager = mock(ExtensionsManager.class);
8787
ReflectionTestUtils.setField(cmd, "extensionsManager", mockManager);
8888
when(mockManager.syncExtension(cmd)).thenReturn(false);
89-
89+
9090
cmd.execute();
9191
}
92-
92+
9393
@Test
9494
public void returnsSystemAccountIdWhenGetEntityOwnerIdIsCalled() {
9595
SyncExtensionCmd cmd = new SyncExtensionCmd();
9696
assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
9797
}
98-
98+
9999
@Test
100100
public void returnsExtensionResourceTypeWhenGetApiResourceTypeIsCalled() {
101101
SyncExtensionCmd cmd = new SyncExtensionCmd();
102102
assertEquals(ApiCommandResourceType.Extension, cmd.getApiResourceType());
103103
}
104-
104+
105105
@Test
106106
public void returnsIdWhenGetApiResourceIdIsCalled() {
107107
SyncExtensionCmd cmd = new SyncExtensionCmd();
108108
ReflectionTestUtils.setField(cmd, "id", 123L);
109109
assertEquals(Long.valueOf(123), cmd.getApiResourceId());
110110
}
111-
111+
112112
@Test
113113
public void returnsCorrectEventType() {
114114
SyncExtensionCmd cmd = new SyncExtensionCmd();
115115
assertEquals(EventTypes.EVENT_EXTENSION_SYNC, cmd.getEventType());
116116
}
117-
117+
118118
@Test
119119
public void returnsCorrectEventDescription() {
120120
SyncExtensionCmd cmd = new SyncExtensionCmd();

utils/src/test/java/org/apache/cloudstack/utils/server/ServerPropertiesUtilTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ public void returnsPropertyValueWhenPropertiesAreLoaded() {
5151
String result = ServerPropertiesUtil.getProperty("key");
5252
assertEquals("value", result);
5353
}
54-
54+
5555
@Test
5656
public void returnsNullWhenPropertyDoesNotExist() {
5757
Properties mockProperties = mock(Properties.class);
5858
ServerPropertiesUtil.propertiesRef.set(mockProperties);
5959
assertNull(ServerPropertiesUtil.getProperty("nonexistentKey"));
6060
}
61-
61+
6262
@Test
6363
public void loadsPropertiesFromFileWhenNotCached() throws Exception {
6464
File tempFile = Files.createTempFile("server", ".properties").toFile();
@@ -70,7 +70,7 @@ public void loadsPropertiesFromFileWhenNotCached() throws Exception {
7070
assertEquals("value", ServerPropertiesUtil.getProperty("key"));
7171
}
7272
}
73-
73+
7474
@Test
7575
public void returnsNullWhenPropertiesFileNotFound() {
7676
try (MockedStatic<PropertiesUtil> mocked = mockStatic(PropertiesUtil.class)) {
@@ -79,7 +79,7 @@ public void returnsNullWhenPropertiesFileNotFound() {
7979
assertNull(ServerPropertiesUtil.getProperty("key"));
8080
}
8181
}
82-
82+
8383
@Test
8484
public void returnsNullWhenIOExceptionOccurs() {
8585
File mockFile = mock(File.class);

0 commit comments

Comments
 (0)