Skip to content

Commit 7856b0f

Browse files
committed
Add more member types to Sort Members test cases
1 parent 17b3e14 commit 7856b0f

File tree

4 files changed

+61
-4
lines changed

4 files changed

+61
-4
lines changed

testlib/src/main/resources/java/eclipse/SortExample.sortMembers.clean

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@ package com.diffplug.spotless.extra.glue.jdt;
22

33
public class SortExample {
44
private static final int A;
5+
static final int B = 1;
6+
protected static final int C = 2;
57
public static final int Z;
68
static {
7-
Z = 1;
9+
Z = 9;
810
A = 0;
911
}
12+
static void s1() {
13+
}
14+
private static void s2() {
15+
}
16+
public static void s3() {
17+
}
18+
protected static void s4() {
19+
}
1020
final boolean _1 = false;
1121
final int a = 1;
1222
public final int b = 1;
@@ -15,6 +25,12 @@ public class SortExample {
1525
protected final int e = 1;
1626
public final int f = 1;
1727
final int z = 1;
28+
SortExample() {
29+
}
30+
SortExample(int a) {
31+
}
32+
SortExample(int b, int c) {
33+
}
1834
class Nested {
1935
public static final String B = "B";
2036
private static final String C = "C";

testlib/src/main/resources/java/eclipse/SortExample.sortMembersByVisibility.clean

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@ package com.diffplug.spotless.extra.glue.jdt;
22

33
public class SortExample {
44
public static final int Z;
5+
protected static final int C = 2;
6+
static final int B = 1;
57
private static final int A;
68
static {
7-
Z = 1;
9+
Z = 9;
810
A = 0;
911
}
12+
public static void s3() {
13+
}
14+
protected static void s4() {
15+
}
16+
static void s1() {
17+
}
18+
private static void s2() {
19+
}
1020
public final int b = 1;
1121
public final int f = 1;
1222
protected final int d = 1;
@@ -15,6 +25,12 @@ public class SortExample {
1525
final int a = 1;
1626
final int z = 1;
1727
private final int c = 1;
28+
SortExample() {
29+
}
30+
SortExample(int a) {
31+
}
32+
SortExample(int b, int c) {
33+
}
1834
class Nested {
1935
public static final String B = "B";
2036
protected static final String D = "D";

testlib/src/main/resources/java/eclipse/SortExample.sortMembersNoFields.clean

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,20 @@ package com.diffplug.spotless.extra.glue.jdt;
33
public class SortExample {
44
public static final int Z;
55
private static final int A;
6+
static final int B = 1;
7+
protected static final int C = 2;
68
static {
7-
Z = 1;
9+
Z = 9;
810
A = 0;
911
}
12+
static void s1() {
13+
}
14+
private static void s2() {
15+
}
16+
public static void s3() {
17+
}
18+
protected static void s4() {
19+
}
1020
final int z = 1;
1121
final int a = 1;
1222
private final int c = 1;
@@ -15,6 +25,12 @@ public class SortExample {
1525
public final int f = 1;
1626
public final int b = 1;
1727
final boolean _1 = false;
28+
SortExample() {
29+
}
30+
SortExample(int a) {
31+
}
32+
SortExample(int b, int c) {
33+
}
1834
class Nested {
1935
private static final String C = "C";
2036
protected static final String D = "D";

testlib/src/main/resources/java/eclipse/SortExample.test

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ public class SortExample {
99
public final int f = 1;
1010
public final int b = 1;
1111
final boolean _1 = false;
12+
static void s1() {}
13+
private static void s2() {}
14+
public static void s3() {}
15+
protected static void s4() {}
16+
SortExample(int b, int c) {}
17+
SortExample(int a) {}
18+
SortExample() {}
1219
class Nested {
1320
void z() {}
1421
private static final String C = "C";
@@ -21,8 +28,10 @@ public class SortExample {
2128
}
2229
public static final int Z;
2330
private static final int A;
31+
static final int B =1;
32+
protected static final int C= 2;
2433
static {
25-
Z = 1;
34+
Z = 9;
2635
A = 0;
2736
}
2837
}

0 commit comments

Comments
 (0)