Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 6d4bbc3

Browse files
ilayaperumalgmarkpollack
authored andcommitted
Fix stream name length in tests
- Limit stream name length to be `20` to allow the resolved app name length inside the allowed limit of 58 chars.
1 parent 278d13f commit 6d4bbc3

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

spring-cloud-dataflow-shell-core/src/test/java/org/springframework/cloud/dataflow/shell/AbstractShellIntegrationTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2017 the original author or authors.
2+
* Copyright 2015-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -184,17 +184,21 @@ protected JobCommandTemplate job() {
184184
* @param name name to use as part of stream/task name
185185
* @return unique random stream/task name
186186
*/
187-
protected String generateUniqueName(String name) {
188-
return name + "-" + idGenerator.generateId();
187+
protected String generateUniqueStreamOrTaskName(String name) {
188+
// Return stream name of 20 characters of length
189+
if (name.length() > 16) {
190+
name = name.substring(0, 16);
191+
}
192+
return name + "-" + idGenerator.generateId().toString().substring(0, 4);
189193
}
190194

191195
/**
192196
* Return a unique random name for stream/task testing.
193197
*
194198
* @return unique random stream/task name
195199
*/
196-
protected String generateUniqueName() {
197-
return generateUniqueName(name.getMethodName().replace('[', '-').replace("]", ""));
200+
protected String generateUniqueStreamOrTaskName() {
201+
return generateUniqueStreamOrTaskName(name.getMethodName().replace('[', '-').replace("]", ""));
198202
}
199203

200204
private static class DataFlowShell extends JLineShellComponent {

spring-cloud-dataflow-shell-core/src/test/java/org/springframework/cloud/dataflow/shell/command/StreamCommandTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -69,14 +69,14 @@ public void destroyStreams() {
6969
public void testStreamLifecycleForTickTock() throws InterruptedException {
7070
logger.info("Starting Stream Test for TickTock");
7171
Thread.sleep(2000);
72-
String streamName = generateUniqueName();
72+
String streamName = generateUniqueStreamOrTaskName();
7373
stream().create(streamName, "time | log");
7474
}
7575

7676
@Test
7777
public void testValidate() throws InterruptedException {
7878
Thread.sleep(2000);
79-
String streamName = generateUniqueName();
79+
String streamName = generateUniqueStreamOrTaskName();
8080
Info info = new Info();
8181
Status status = new Status();
8282
status.setStatusCode(StatusCode.UNKNOWN);

spring-cloud-dataflow-shell-core/src/test/java/org/springframework/cloud/dataflow/shell/command/TaskCommandTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ public void registerApps() {
114114
@Test
115115
public void testTaskLaunch() {
116116
logger.info("Launching instance of task");
117-
String taskName = generateUniqueName();
117+
String taskName = generateUniqueStreamOrTaskName();
118118
task().create(taskName, "timestamp");
119119
task().launch(taskName);
120120
}
121121

122122
@Test
123123
public void testCreateTask() {
124124
logger.info("Create Task Test");
125-
String taskName = generateUniqueName();
125+
String taskName = generateUniqueStreamOrTaskName();
126126
task().create(taskName, "timestamp");
127127
}
128128

129129
@Test
130130
public void destroySpecificTask() {
131131
logger.info("Create Task Test");
132-
String taskName = generateUniqueName();
132+
String taskName = generateUniqueStreamOrTaskName();
133133
task().create(taskName, "timestamp");
134134
logger.info("Destroy created task");
135135
task().destroyTask(taskName);
@@ -138,9 +138,9 @@ public void destroySpecificTask() {
138138
@Test
139139
public void destroyAllTasks() {
140140
logger.info("Create Task Test");
141-
String taskName1 = generateUniqueName();
141+
String taskName1 = generateUniqueStreamOrTaskName();
142142
task().create(taskName1, "timestamp");
143-
String taskName2 = generateUniqueName();
143+
String taskName2 = generateUniqueStreamOrTaskName();
144144
task().create(taskName2, "timestamp");
145145
task().destroyAllTasks();
146146
}
@@ -218,7 +218,7 @@ public void testViewExecution() {
218218

219219
@Test
220220
public void testValidate() {
221-
String taskName = generateUniqueName();
221+
String taskName = generateUniqueStreamOrTaskName();
222222
task().create(taskName, "timestamp");
223223

224224
CommandResult cr = task().taskValidate(taskName);

0 commit comments

Comments
 (0)