Skip to content

Commit 2dc4149

Browse files
nosansnicoll
authored andcommitted
Restore NullMarked ArchRule tests
See gh-46876 Signed-off-by: Dmytro Nosan <[email protected]>
1 parent cf0156d commit 2dc4149

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,19 @@ void whenBeanMethodExposesNonPrivateTypeShouldSucceedAndWriteEmptyReport(Task ta
270270
build(this.gradleBuild.withDependencies(SPRING_CONTEXT), task);
271271
}
272272

273+
@Test
274+
void whenPackageIsNotAnnotatedWithNullMarkedWithMainSourcesShouldFailAndWriteEmptyReport() throws IOException {
275+
prepareTask(Task.CHECK_ARCHITECTURE_MAIN, "nullmarked/notannotated");
276+
buildAndFail(this.gradleBuild.withNullMarked(true), Task.CHECK_ARCHITECTURE_MAIN,
277+
"Package org.springframework.boot.build.architecture.nullmarked.notannotated is not annotated with @NullMarked");
278+
}
279+
280+
@Test
281+
void whenPackageIsNotAnnotatedWithNullMarkedWithTestSourcesShouldSucceedAndWriteEmptyReport() throws IOException {
282+
prepareTask(Task.CHECK_ARCHITECTURE_TEST, "nullmarked/notannotated");
283+
build(this.gradleBuild.withNullMarked(true), Task.CHECK_ARCHITECTURE_TEST);
284+
}
285+
273286
private void prepareTask(Task task, String... sourceDirectories) throws IOException {
274287
for (String sourceDirectory : sourceDirectories) {
275288
FileSystemUtils.copyRecursively(
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.build.architecture.nullmarked.notannotated;
18+
19+
public class TestClass {
20+
21+
}

0 commit comments

Comments
 (0)