Skip to content

Commit 241eca6

Browse files
committed
Remove methods deprecated by GH-447
1 parent 42e277d commit 241eca6

File tree

2 files changed

+0
-222
lines changed

2 files changed

+0
-222
lines changed

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/JctCompilationAssert.java

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -250,22 +250,6 @@ public OutputContainerGroupAssert outputGroup(Location location) {
250250
return new OutputContainerGroupAssert(group);
251251
}
252252

253-
/**
254-
* Get assertions on the path containing class outputs, if it exists.
255-
*
256-
* <p>If not configured, the value being asserted on will be {@code null} in value.
257-
*
258-
* @return the assertions to perform on the class outputs.
259-
* @throws AssertionError if the compilation was null, or no group for the location
260-
* was found.
261-
* @deprecated use {@link #classOutputPackages()} or {@link #classOutputModules()} instead.
262-
*/
263-
@Deprecated(since = "0.6.4", forRemoval = true)
264-
@SuppressWarnings("DeprecatedIsStillUsed")
265-
public OutputContainerGroupAssert classOutput() {
266-
return outputGroup(StandardLocation.CLASS_OUTPUT);
267-
}
268-
269253
/**
270254
* Get assertions on the path containing class package outputs, if it exists.
271255
*
@@ -294,22 +278,6 @@ public ModuleContainerGroupAssert classOutputModules() {
294278
return outputGroup(StandardLocation.CLASS_OUTPUT).modules();
295279
}
296280

297-
/**
298-
* Get assertions on the path containing generated source outputs, if it exists.
299-
*
300-
* <p>If not configured, the value being asserted on will be {@code null} in value.
301-
*
302-
* @return the assertions to perform on the source outputs.
303-
* @throws AssertionError if the compilation was null, or no group for the location
304-
* was found.
305-
* @deprecated use {@link #sourceOutputPackages()} or {@link #sourceOutputModules()} instead.
306-
*/
307-
@Deprecated(since = "0.6.4", forRemoval = true)
308-
@SuppressWarnings("DeprecatedIsStillUsed")
309-
public OutputContainerGroupAssert sourceOutput() {
310-
return outputGroup(StandardLocation.SOURCE_OUTPUT);
311-
}
312-
313281
/**
314282
* Get assertions on the path containing generated source package outputs, if it exists.
315283
*
@@ -338,22 +306,6 @@ public ModuleContainerGroupAssert sourceOutputModules() {
338306
return outputGroup(StandardLocation.SOURCE_OUTPUT).modules();
339307
}
340308

341-
/**
342-
* Get assertions on the path containing the class path, if it exists.
343-
*
344-
* <p>If not configured, the value being asserted on will be {@code null} in value.
345-
*
346-
* @return the assertions to perform on the class path.
347-
* @throws AssertionError if the compilation was null, or no group for the location
348-
* was found.
349-
* @deprecated use {@link #classPathPackages()} instead.
350-
*/
351-
@Deprecated(since = "0.6.4", forRemoval = true)
352-
@SuppressWarnings("DeprecatedIsStillUsed")
353-
public PackageContainerGroupAssert classPath() {
354-
return packageGroup(StandardLocation.CLASS_PATH);
355-
}
356-
357309
/**
358310
* Get assertions on the path containing the class path, if it exists.
359311
*
@@ -368,22 +320,6 @@ public PackageContainerGroupAssert classPathPackages() {
368320
return packageGroup(StandardLocation.CLASS_PATH);
369321
}
370322

371-
/**
372-
* Get assertions on the path containing the source path, if it exists.
373-
*
374-
* <p>If not configured, the value being asserted on will be {@code null} in value.
375-
*
376-
* @return the assertions to perform on the source path.
377-
* @throws AssertionError if the compilation was null, or no group for the location
378-
* was found.
379-
* @deprecated use {@link #sourcePathPackages()} instead.
380-
*/
381-
@Deprecated(since = "0.6.4", forRemoval = true)
382-
@SuppressWarnings("DeprecatedIsStillUsed")
383-
public PackageContainerGroupAssert sourcePath() {
384-
return packageGroup(StandardLocation.SOURCE_PATH);
385-
}
386-
387323
/**
388324
* Get assertions on the path containing the source path, if it exists.
389325
*
@@ -398,22 +334,6 @@ public PackageContainerGroupAssert sourcePathPackages() {
398334
return packageGroup(StandardLocation.SOURCE_PATH);
399335
}
400336

401-
/**
402-
* Get assertions on the path containing the source path, if it exists.
403-
*
404-
* <p>If not configured, the value being asserted on will be {@code null} in value.
405-
*
406-
* @return the assertions to perform on the source path.
407-
* @throws AssertionError if the compilation was null, or no group for the location
408-
* was found.
409-
* @deprecated use {@link #moduleSourcePathModules()} instead.
410-
*/
411-
@Deprecated(since = "0.6.4", forRemoval = true)
412-
@SuppressWarnings("DeprecatedIsStillUsed")
413-
public ModuleContainerGroupAssert moduleSourcePath() {
414-
return moduleGroup(StandardLocation.MODULE_SOURCE_PATH);
415-
}
416-
417337
/**
418338
* Get assertions on the path containing the source path, if it exists.
419339
*
@@ -428,22 +348,6 @@ public ModuleContainerGroupAssert moduleSourcePathModules() {
428348
return moduleGroup(StandardLocation.MODULE_SOURCE_PATH);
429349
}
430350

431-
/**
432-
* Get assertions on the path containing the module path, if it exists.
433-
*
434-
* <p>If not configured, the value being asserted on will be {@code null} in value.
435-
*
436-
* @return the assertions to perform on the module path.
437-
* @throws AssertionError if the compilation was null, or no group for the location
438-
* was found.
439-
* @deprecated use {@link #modulePathModules()} instead.
440-
*/
441-
@Deprecated(since = "0.6.4", forRemoval = true)
442-
@SuppressWarnings("DeprecatedIsStillUsed")
443-
public ModuleContainerGroupAssert modulePath() {
444-
return moduleGroup(StandardLocation.MODULE_PATH);
445-
}
446-
447351
/**
448352
* Get assertions on the path containing the module path, if it exists.
449353
*

java-compiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/assertions/JctCompilationAssertTest.java

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -765,27 +765,6 @@ void outputGroupReturnsContainerGroupAssertions() {
765765
}
766766
}
767767

768-
@DisplayName(".classOutput() performs the expected operations")
769-
@SuppressWarnings("removal")
770-
@Test
771-
void classOutputPerformsTheExpectedOperations() {
772-
// Given
773-
var expectedAssertions = mock(OutputContainerGroupAssert.class);
774-
775-
var assertions = mock(JctCompilationAssert.class);
776-
when(assertions.classOutput()).thenCallRealMethod();
777-
when(assertions.outputGroup(any())).thenReturn(expectedAssertions);
778-
779-
// When
780-
var actualAssertions = assertions.classOutput();
781-
782-
// Then
783-
verify(assertions).classOutput();
784-
verify(assertions).outputGroup(StandardLocation.CLASS_OUTPUT);
785-
verifyNoMoreInteractions(assertions);
786-
assertThat(actualAssertions).isSameAs(expectedAssertions);
787-
}
788-
789768
@DisplayName(".classOutputPackages() performs the expected operations")
790769
@Test
791770
void classOutputPackagesPerformsTheExpectedOperations() {
@@ -834,27 +813,6 @@ void classOutputModulesPerformsTheExpectedOperations() {
834813
assertThat(actualAssertions).isSameAs(expectedAssertions);
835814
}
836815

837-
@DisplayName(".sourceOutput() performs the expected operations")
838-
@SuppressWarnings("removal")
839-
@Test
840-
void sourceOutputPerformsTheExpectedOperations() {
841-
// Given
842-
var expectedAssertions = mock(OutputContainerGroupAssert.class);
843-
844-
var assertions = mock(JctCompilationAssert.class);
845-
when(assertions.sourceOutput()).thenCallRealMethod();
846-
when(assertions.outputGroup(any())).thenReturn(expectedAssertions);
847-
848-
// When
849-
var actualAssertions = assertions.sourceOutput();
850-
851-
// Then
852-
verify(assertions).sourceOutput();
853-
verify(assertions).outputGroup(StandardLocation.SOURCE_OUTPUT);
854-
verifyNoMoreInteractions(assertions);
855-
assertThat(actualAssertions).isSameAs(expectedAssertions);
856-
}
857-
858816
@DisplayName(".sourceOutputPackages() performs the expected operations")
859817
@Test
860818
void sourceOutputPackagesPerformsTheExpectedOperations() {
@@ -903,27 +861,6 @@ void sourceOutputModulesPerformsTheExpectedOperations() {
903861
assertThat(actualAssertions).isSameAs(expectedAssertions);
904862
}
905863

906-
@DisplayName(".classPath() performs the expected operations")
907-
@SuppressWarnings("removal")
908-
@Test
909-
void classPathPerformsTheExpectedOperations() {
910-
// Given
911-
var expectedAssertions = mock(PackageContainerGroupAssert.class);
912-
913-
var assertions = mock(JctCompilationAssert.class);
914-
when(assertions.classPath()).thenCallRealMethod();
915-
when(assertions.packageGroup(any())).thenReturn(expectedAssertions);
916-
917-
// When
918-
var actualAssertions = assertions.classPath();
919-
920-
// Then
921-
verify(assertions).classPath();
922-
verify(assertions).packageGroup(StandardLocation.CLASS_PATH);
923-
verifyNoMoreInteractions(assertions);
924-
assertThat(actualAssertions).isSameAs(expectedAssertions);
925-
}
926-
927864
@DisplayName(".classPathPackages() performs the expected operations")
928865
@Test
929866
void classPathPackagesPerformsTheExpectedOperations() {
@@ -944,27 +881,6 @@ void classPathPackagesPerformsTheExpectedOperations() {
944881
assertThat(actualAssertions).isSameAs(expectedAssertions);
945882
}
946883

947-
@DisplayName(".sourcePath() performs the expected operations")
948-
@SuppressWarnings("removal")
949-
@Test
950-
void sourcePathPerformsTheExpectedOperations() {
951-
// Given
952-
var expectedAssertions = mock(PackageContainerGroupAssert.class);
953-
954-
var assertions = mock(JctCompilationAssert.class);
955-
when(assertions.sourcePath()).thenCallRealMethod();
956-
when(assertions.packageGroup(any())).thenReturn(expectedAssertions);
957-
958-
// When
959-
var actualAssertions = assertions.sourcePath();
960-
961-
// Then
962-
verify(assertions).sourcePath();
963-
verify(assertions).packageGroup(StandardLocation.SOURCE_PATH);
964-
verifyNoMoreInteractions(assertions);
965-
assertThat(actualAssertions).isSameAs(expectedAssertions);
966-
}
967-
968884
@DisplayName(".sourcePathPackages() performs the expected operations")
969885
@Test
970886
void sourcePathPackagesPerformsTheExpectedOperations() {
@@ -985,27 +901,6 @@ void sourcePathPackagesPerformsTheExpectedOperations() {
985901
assertThat(actualAssertions).isSameAs(expectedAssertions);
986902
}
987903

988-
@DisplayName(".moduleSourcePath() performs the expected operations")
989-
@SuppressWarnings("removal")
990-
@Test
991-
void moduleSourcePathPerformsTheExpectedOperations() {
992-
// Given
993-
var expectedAssertions = mock(ModuleContainerGroupAssert.class);
994-
995-
var assertions = mock(JctCompilationAssert.class);
996-
when(assertions.moduleSourcePath()).thenCallRealMethod();
997-
when(assertions.moduleGroup(any())).thenReturn(expectedAssertions);
998-
999-
// When
1000-
var actualAssertions = assertions.moduleSourcePath();
1001-
1002-
// Then
1003-
verify(assertions).moduleSourcePath();
1004-
verify(assertions).moduleGroup(StandardLocation.MODULE_SOURCE_PATH);
1005-
verifyNoMoreInteractions(assertions);
1006-
assertThat(actualAssertions).isSameAs(expectedAssertions);
1007-
}
1008-
1009904
@DisplayName(".moduleSourcePathModules() performs the expected operations")
1010905
@Test
1011906
void moduleSourcePathModulesPerformsTheExpectedOperations() {
@@ -1025,27 +920,6 @@ void moduleSourcePathModulesPerformsTheExpectedOperations() {
1025920
verifyNoMoreInteractions(assertions);
1026921
assertThat(actualAssertions).isSameAs(expectedAssertions);
1027922
}
1028-
1029-
@DisplayName(".modulePath() performs the expected operations")
1030-
@SuppressWarnings("removal")
1031-
@Test
1032-
void modulePathPerformsTheExpectedOperations() {
1033-
// Given
1034-
var expectedAssertions = mock(ModuleContainerGroupAssert.class);
1035-
1036-
var assertions = mock(JctCompilationAssert.class);
1037-
when(assertions.modulePath()).thenCallRealMethod();
1038-
when(assertions.moduleGroup(any())).thenReturn(expectedAssertions);
1039-
1040-
// When
1041-
var actualAssertions = assertions.modulePath();
1042-
1043-
// Then
1044-
verify(assertions).modulePath();
1045-
verify(assertions).moduleGroup(StandardLocation.MODULE_PATH);
1046-
verifyNoMoreInteractions(assertions);
1047-
assertThat(actualAssertions).isSameAs(expectedAssertions);
1048-
}
1049923

1050924
@DisplayName(".modulePathModules() performs the expected operations")
1051925
@Test

0 commit comments

Comments
 (0)