Skip to content

Commit 70be2ad

Browse files
committed
Reduce SysInfoProcTest to just 4.4 compat
1 parent de2ad77 commit 70be2ad

File tree

1 file changed

+2
-142
lines changed

1 file changed

+2
-142
lines changed

proc/sysinfo/src/test/java/org/neo4j/gds/SysInfoProcTest.java

Lines changed: 2 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -50,48 +50,7 @@ class SysInfoProcTest extends BaseProcTest {
5050

5151
private static final Collection<String> ALL_COMPATIBILITIES = List.of(
5252
"Neo4j 4.4",
53-
"Neo4j Settings 4.4",
54-
55-
"Neo4j 5.x",
56-
"Neo4j 5.x (placeholder)",
57-
"Neo4j Settings 5.x",
58-
"Neo4j Settings 5.x (placeholder)",
59-
60-
"Neo4j 5.11",
61-
"Neo4j 5.11 (placeholder)",
62-
63-
"Neo4j 5.12",
64-
"Neo4j 5.12 (placeholder)",
65-
66-
"Neo4j 5.13",
67-
"Neo4j 5.13 (placeholder)",
68-
69-
"Neo4j 5.14",
70-
"Neo4j 5.14 (placeholder)",
71-
72-
"Neo4j 5.15",
73-
"Neo4j 5.15 (placeholder)",
74-
75-
"Neo4j 5.16",
76-
"Neo4j 5.16 (placeholder)",
77-
78-
"Neo4j 5.17",
79-
"Neo4j 5.17 (placeholder)",
80-
81-
"Neo4j 5.18",
82-
"Neo4j 5.18 (placeholder)",
83-
84-
"Neo4j 5.19",
85-
"Neo4j 5.19 (placeholder)",
86-
87-
"Neo4j 5.20",
88-
"Neo4j 5.20 (placeholder)",
89-
90-
"Neo4j DEV",
91-
"Neo4j DEV (placeholder)",
92-
93-
"Neo4j RC",
94-
"Neo4j RC (placeholder)"
53+
"Neo4j Settings 4.4"
9554
);
9655

9756
@BeforeEach
@@ -143,95 +102,6 @@ void testSysInfoProc() throws IOException {
143102
case V_4_4:
144103
expectedCompatibilities = Set.of("Neo4j 4.4", "Neo4j Settings 4.4");
145104
break;
146-
case V_5_11:
147-
expectedCompatibilities = Set.of(
148-
"Neo4j Settings 5.x (placeholder)",
149-
"Neo4j Settings 5.x",
150-
"Neo4j 5.11 (placeholder)",
151-
"Neo4j 5.11"
152-
);
153-
break;
154-
case V_5_12:
155-
expectedCompatibilities = Set.of(
156-
"Neo4j Settings 5.x (placeholder)",
157-
"Neo4j Settings 5.x",
158-
"Neo4j 5.12 (placeholder)",
159-
"Neo4j 5.12"
160-
);
161-
break;
162-
case V_5_13:
163-
expectedCompatibilities = Set.of(
164-
"Neo4j Settings 5.x (placeholder)",
165-
"Neo4j Settings 5.x",
166-
"Neo4j 5.13 (placeholder)",
167-
"Neo4j 5.13"
168-
);
169-
break;
170-
case V_5_14:
171-
expectedCompatibilities = Set.of(
172-
"Neo4j Settings 5.x (placeholder)",
173-
"Neo4j Settings 5.x",
174-
"Neo4j 5.14 (placeholder)",
175-
"Neo4j 5.14"
176-
);
177-
break;
178-
case V_5_15:
179-
expectedCompatibilities = Set.of(
180-
"Neo4j Settings 5.x (placeholder)",
181-
"Neo4j Settings 5.x",
182-
"Neo4j 5.15 (placeholder)",
183-
"Neo4j 5.15"
184-
);
185-
break;
186-
case V_5_16:
187-
expectedCompatibilities = Set.of(
188-
"Neo4j Settings 5.x (placeholder)",
189-
"Neo4j Settings 5.x",
190-
"Neo4j 5.16 (placeholder)",
191-
"Neo4j 5.16"
192-
);
193-
break;
194-
case V_5_17:
195-
expectedCompatibilities = Set.of(
196-
"Neo4j Settings 5.x (placeholder)",
197-
"Neo4j Settings 5.x",
198-
"Neo4j 5.17 (placeholder)",
199-
"Neo4j 5.17"
200-
);
201-
break;
202-
case V_5_18:
203-
expectedCompatibilities = Set.of(
204-
"Neo4j Settings 5.x (placeholder)",
205-
"Neo4j Settings 5.x",
206-
"Neo4j 5.18 (placeholder)",
207-
"Neo4j 5.18"
208-
);
209-
break;
210-
case V_5_19:
211-
expectedCompatibilities = Set.of(
212-
"Neo4j Settings 5.x (placeholder)",
213-
"Neo4j Settings 5.x",
214-
"Neo4j 5.19 (placeholder)",
215-
"Neo4j 5.19"
216-
);
217-
break;
218-
case V_5_20:
219-
expectedCompatibilities = Set.of(
220-
"Neo4j Settings 5.x (placeholder)",
221-
"Neo4j Settings 5.x",
222-
"Neo4j 5.20 (placeholder)",
223-
"Neo4j 5.20"
224-
);
225-
break;
226-
case V_RC:
227-
expectedCompatibilities = Set.of(
228-
"Neo4j Settings 5.x",
229-
"Neo4j Settings 5.x (placeholder)",
230-
"Neo4j RC",
231-
"Neo4j DEV (placeholder)",
232-
"Neo4j DEV"
233-
);
234-
break;
235105
default:
236106
throw new IllegalStateException("Unexpected Neo4j version: " + neo4jVersion);
237107
}
@@ -243,16 +113,7 @@ void testSysInfoProc() throws IOException {
243113
var actualItems = (items instanceof String) ? List.of(items) : items;
244114
assertThat(actualItems)
245115
.asInstanceOf(InstanceOfAssertFactories.list(String.class))
246-
.isSubsetOf(expectedCompatibilities)
247-
.doesNotContainAnyElementsOf(allCompatibilities);
248-
};
249-
250-
Consumer<Object> unavailableCompat = (items) -> {
251-
var actualItems = (items instanceof String) ? List.of(items) : items;
252-
assertThat(actualItems)
253-
.asInstanceOf(InstanceOfAssertFactories.list(String.class))
254-
.isSubsetOf(allCompatibilities)
255-
.doesNotContainAnyElementsOf(expectedCompatibilities);
116+
.containsExactlyElementsOf(expectedCompatibilities);
256117
};
257118

258119
assertThat(result)
@@ -265,7 +126,6 @@ void testSysInfoProc() throws IOException {
265126
.containsEntry("buildHash", buildInfoProperties.buildHash())
266127
.containsEntry("neo4jVersion", Version.getNeo4jVersion())
267128
.hasEntrySatisfying("availableCompatibility", availableCompat)
268-
.hasEntrySatisfying("unavailableCompatibility", unavailableCompat)
269129
.hasEntrySatisfying("gdsEdition", GDS_EDITION)
270130
.hasEntrySatisfying("availableCPUs", isInteger)
271131
.hasEntrySatisfying("physicalCPUs", isInteger)

0 commit comments

Comments
 (0)