Skip to content

Commit 24a27eb

Browse files
committed
refactor: move test stub out
1 parent 24bc8d6 commit 24a27eb

File tree

2 files changed

+33
-31
lines changed

2 files changed

+33
-31
lines changed

src/test/java/org/jd/core/v1/JavaArrayTest.java

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
2525
import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
2626
import org.jd.core.v1.service.writer.WriteTokenProcessor;
27+
import org.jd.core.v1.stub.InitializedArrayInTernaryOperator;
2728
import org.junit.Test;
2829

2930
import java.io.InputStream;
@@ -89,41 +90,17 @@ public void testJdk170Array() throws Exception {
8990

9091
@Test
9192
public void testInitializedArrayInTernaryOperator() throws Exception {
92-
class InitializedArrayInTernaryOperator {
93-
Class[] test0(int i) {
94-
return (i == 0) ? new Class[] { Object.class } : null;
95-
}
96-
Class[] test2(int i) {
97-
return (i == 0) ? new Class[] { Object.class, String.class, Number.class } : null;
98-
}
99-
Class[][] test3(int i) {
100-
return (i == 0) ? new Class[][] { { Object.class }, { String.class, Number.class} } : null;
101-
}
102-
Class[] test4(int i) {
103-
return (i == 0) ? null : new Class[] { Object.class };
104-
}
105-
Class[] test5(int i) {
106-
return (i == 0) ? null : new Class[] { Object.class, String.class, Number.class };
107-
}
108-
Class[][] test6(int i) {
109-
return (i == 0) ? null : new Class[][] { { Object.class }, { String.class, Number.class} };
110-
}
111-
Class[] test7(int i) {
112-
return (i == 0) ? new Class[] { Object.class } : new Class[] { String.class, Number.class };
113-
}
114-
}
115-
11693
String internalClassName = InitializedArrayInTernaryOperator.class.getName().replace('.', '/');
11794
String source = decompile(new ClassPathLoader(), new PlainTextPrinter(), internalClassName);
11895

11996
// Check decompiled source code
120-
assertTrue(source.matches(PatternMaker.make(": 93 */", "return (i == 0) ? new Class<?>[] { Object.class } : null;")));
121-
assertTrue(source.matches(PatternMaker.make(": 96 */", "return (i == 0) ? new Class<?>[] { Object.class, String.class, Number.class } : null;")));
122-
assertTrue(source.matches(PatternMaker.make(": 99 */", "return (i == 0) ? new Class[][] { { Object.class }, { String.class, Number.class } } : null;")));
123-
assertTrue(source.matches(PatternMaker.make(": 102 */", "return (i == 0) ? null : new Class<?>[] { Object.class };")));
124-
assertTrue(source.matches(PatternMaker.make(": 105 */", "return (i == 0) ? null : new Class<?>[] { Object.class, String.class, Number.class };")));
125-
assertTrue(source.matches(PatternMaker.make(": 108 */", "return (i == 0) ? null : new Class[][] { { Object.class }, { String.class, Number.class} };")));
126-
assertTrue(source.matches(PatternMaker.make(": 111 */", "return (i == 0) ? new Class<?>[] { Object.class } : new Class<?>[] { String.class, Number.class };")));
97+
assertTrue(source.matches(PatternMaker.make(": 5 */", "return (i == 0) ? new Class<?>[] { Object.class } : null;")));
98+
assertTrue(source.matches(PatternMaker.make(": 8 */", "return (i == 0) ? new Class<?>[] { Object.class, String.class, Number.class } : null;")));
99+
assertTrue(source.matches(PatternMaker.make(": 11 */", "return (i == 0) ? new Class[][] { { Object.class }, { String.class, Number.class } } : null;")));
100+
assertTrue(source.matches(PatternMaker.make(": 14 */", "return (i == 0) ? null : new Class<?>[] { Object.class };")));
101+
assertTrue(source.matches(PatternMaker.make(": 17 */", "return (i == 0) ? null : new Class<?>[] { Object.class, String.class, Number.class };")));
102+
assertTrue(source.matches(PatternMaker.make(": 20 */", "return (i == 0) ? null : new Class[][] { { Object.class }, { String.class, Number.class} };")));
103+
assertTrue(source.matches(PatternMaker.make(": 23 */", "return (i == 0) ? new Class<?>[] { Object.class } : new Class<?>[] { String.class, Number.class };")));
127104

128105
// Recompile decompiled source code and check errors
129106
assertTrue(CompilerUtil.compile("1.8", new JavaSourceFileObject(internalClassName, source)));
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.jd.core.v1.stub;
2+
3+
public class InitializedArrayInTernaryOperator {
4+
Class[] test0(int i) {
5+
return (i == 0) ? new Class[] { Object.class } : null;
6+
}
7+
Class[] test2(int i) {
8+
return (i == 0) ? new Class[] { Object.class, String.class, Number.class } : null;
9+
}
10+
Class[][] test3(int i) {
11+
return (i == 0) ? new Class[][] { { Object.class }, { String.class, Number.class} } : null;
12+
}
13+
Class[] test4(int i) {
14+
return (i == 0) ? null : new Class[] { Object.class };
15+
}
16+
Class[] test5(int i) {
17+
return (i == 0) ? null : new Class[] { Object.class, String.class, Number.class };
18+
}
19+
Class[][] test6(int i) {
20+
return (i == 0) ? null : new Class[][] { { Object.class }, { String.class, Number.class} };
21+
}
22+
Class[] test7(int i) {
23+
return (i == 0) ? new Class[] { Object.class } : new Class[] { String.class, Number.class };
24+
}
25+
}

0 commit comments

Comments
 (0)