Skip to content

Commit 6de6e93

Browse files
committed
Move generated ruby client test to java.io.swagger.codegen.ruby package.
1 parent 8bacbfb commit 6de6e93

File tree

2 files changed

+67
-27
lines changed

2 files changed

+67
-27
lines changed

modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.swagger.codegen;
22

33
import io.swagger.codegen.languages.JavaClientCodegen;
4-
import io.swagger.codegen.languages.RubyClientCodegen;
54
import io.swagger.models.Swagger;
65
import io.swagger.parser.SwaggerParser;
76
import org.apache.commons.io.FileUtils;
@@ -222,32 +221,6 @@ public void testGenerateUniqueOperationIds() {
222221
}
223222
}
224223

225-
@Test
226-
public void testGenerateRubyClientWithHtmlEntity() throws Exception {
227-
final File output = folder.getRoot();
228-
229-
final Swagger swagger = new SwaggerParser().read("src/test/resources/2_0/pathWithHtmlEntity.yaml");
230-
CodegenConfig codegenConfig = new RubyClientCodegen();
231-
codegenConfig.setOutputDir(output.getAbsolutePath());
232-
233-
ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
234-
235-
DefaultGenerator generator = new DefaultGenerator();
236-
generator.opts(clientOptInput);
237-
List<File> files = generator.generate();
238-
boolean apiFileGenerated = false;
239-
for (File file : files) {
240-
if (file.getName().equals("default_api.rb")) {
241-
apiFileGenerated = true;
242-
// Ruby client should set the path unescaped in the api file
243-
assertTrue(FileUtils.readFileToString(file, StandardCharsets.UTF_8).contains("local_var_path = \"/foo=bar\""));
244-
}
245-
}
246-
if (!apiFileGenerated) {
247-
fail("Default api file is not generated!");
248-
}
249-
}
250-
251224
private static void changeContent(File file) throws IOException {
252225
Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), UTF_8));
253226
out.write(TEST_SKIP_OVERWRITE);
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package io.swagger.codegen.ruby;
2+
3+
import io.swagger.codegen.ClientOpts;
4+
import io.swagger.codegen.ClientOptInput;
5+
import io.swagger.codegen.CodegenConfig;
6+
import io.swagger.codegen.DefaultGenerator;
7+
import io.swagger.codegen.languages.RubyClientCodegen;
8+
import io.swagger.models.Swagger;
9+
import io.swagger.parser.SwaggerParser;
10+
11+
import org.apache.commons.io.FileUtils;
12+
import org.junit.rules.TemporaryFolder;
13+
import org.testng.annotations.AfterMethod;
14+
import org.testng.annotations.BeforeMethod;
15+
import org.testng.annotations.Test;
16+
17+
import java.io.File;
18+
import java.nio.charset.StandardCharsets;
19+
import java.util.List;
20+
21+
import static org.junit.Assert.fail;
22+
import static org.testng.Assert.*;
23+
24+
/**
25+
* Tests for RubyClientCodegen-generated templates
26+
*/
27+
public class RubyClientCodegenTest {
28+
29+
public TemporaryFolder folder = new TemporaryFolder();
30+
31+
@BeforeMethod
32+
public void setUp() throws Exception {
33+
folder.create();
34+
}
35+
36+
@AfterMethod
37+
public void tearDown() throws Exception {
38+
folder.delete();
39+
}
40+
41+
@Test
42+
public void testGenerateRubyClientWithHtmlEntity() throws Exception {
43+
final File output = folder.getRoot();
44+
45+
final Swagger swagger = new SwaggerParser().read("src/test/resources/2_0/pathWithHtmlEntity.yaml");
46+
CodegenConfig codegenConfig = new RubyClientCodegen();
47+
codegenConfig.setOutputDir(output.getAbsolutePath());
48+
49+
ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
50+
51+
DefaultGenerator generator = new DefaultGenerator();
52+
generator.opts(clientOptInput);
53+
List<File> files = generator.generate();
54+
boolean apiFileGenerated = false;
55+
for (File file : files) {
56+
if (file.getName().equals("default_api.rb")) {
57+
apiFileGenerated = true;
58+
// Ruby client should set the path unescaped in the api file
59+
assertTrue(FileUtils.readFileToString(file, StandardCharsets.UTF_8).contains("local_var_path = \"/foo=bar\""));
60+
}
61+
}
62+
if (!apiFileGenerated) {
63+
fail("Default api file is not generated!");
64+
}
65+
}
66+
67+
}

0 commit comments

Comments
 (0)