root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Consistent handling of AssertProvider implementations

This commit is contained in:
Stéphane Nicoll 2024-02-20 10:19:19 +01:00
parent 46bd133892
commit 06a39f166e
5 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsInvocations.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -39,6 +39,10 @@ public class RuntimeHintsInvocations implements AssertProvider<RuntimeHintsInvoc
this.invocations = invocations; this.invocations = invocations;
} }
/**
* Use {@code assertThat(invocations)} rather than calling this method
* directly.
*/
@Override @Override
public RuntimeHintsInvocationsAssert assertThat() { public RuntimeHintsInvocationsAssert assertThat() {
return new RuntimeHintsInvocationsAssert(this); return new RuntimeHintsInvocationsAssert(this);

8
spring-core-test/src/main/java/org/springframework/core/test/tools/ResourceFile.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -86,12 +86,10 @@ public final class ResourceFile extends DynamicFile implements AssertProvider<Re
} }
/** /**
* AssertJ {@code assertThat} support. * Use {@code assertThat(sourceFile)} rather than calling this method
* @deprecated use {@code assertThat(sourceFile)} rather than calling this * directly.
* method directly.
*/ */
@Override @Override
@Deprecated
public ResourceFileAssert assertThat() { public ResourceFileAssert assertThat() {
return new ResourceFileAssert(this); return new ResourceFileAssert(this);
} }

8
spring-core-test/src/main/java/org/springframework/core/test/tools/SourceFile.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -218,12 +218,10 @@ public final class SourceFile extends DynamicFile implements AssertProvider<Sour
} }
/** /**
* AssertJ {@code assertThat} support. * Use {@code assertThat(sourceFile)} rather than calling this method
* @deprecated use {@code assertThat(sourceFile)} rather than calling this * directly.
* method directly.
*/ */
@Override @Override
@Deprecated
public SourceFileAssert assertThat() { public SourceFileAssert assertThat() {
return new SourceFileAssert(this); return new SourceFileAssert(this);
} }

9
spring-core-test/src/test/java/org/springframework/core/test/tools/ResourceFileTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -42,10 +42,9 @@ class ResourceFileTests {
} }
@Test @Test
@SuppressWarnings("deprecation") void assertThatUsesResourceFileAssert() {
void assertThatReturnsResourceFileAssert() { ResourceFile file = ResourceFile.of("path", appendable -> appendable.append("test"));
ResourceFile file = ResourceFile.of("path", "test"); assertThat(file).hasContent("test");
assertThat(file.assertThat()).isInstanceOf(ResourceFileAssert.class);
} }
} }

7
spring-core-test/src/test/java/org/springframework/core/test/tools/SourceFileTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -106,10 +106,9 @@ class SourceFileTests {
} }
@Test @Test
@SuppressWarnings("deprecation") void assertThatUseSourceFileAssert() {
void assertThatReturnsAssert() {
SourceFile sourceFile = SourceFile.of(HELLO_WORLD); SourceFile sourceFile = SourceFile.of(HELLO_WORLD);
assertThat(sourceFile.assertThat()).isInstanceOf(SourceFileAssert.class); assertThat(sourceFile).hasContent(HELLO_WORLD);
} }
@Test @Test