Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2023-06-24 14:15:05 +02:00
parent 35667e81ea f86a69ebfb
commit 19686adc01
15 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
View File

@@ -102,18 +102,3 @@ class BeforeAdviceBindingTests {
}
}
class AuthenticationLogger {
public void logAuthenticationAttempt(String username) {
System.out.println("User [" + username + "] attempting to authenticate");
}
}
class SecurityManager {
public boolean authenticate(String username, String password) {
return false;
}
}

3
spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -187,7 +187,6 @@ class CommonsPool2TargetSourceTests {
// release all objects
for (int i = 0; i < pooledInstances.length; i++) {
System.out.println(i);
targetSource.releaseTarget(pooledInstances[i]);
}
}

6
spring-context/src/test/java/org/springframework/context/support/Assembler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,10 @@ public class Assembler implements TestIF {
@SuppressWarnings("unused")
private Service service;
private Logic l;
@SuppressWarnings("unused")
private String name;
public void setService(Service service) {
@@ -42,7 +45,6 @@ public class Assembler implements TestIF {
}
public void output() {
System.out.println("Bean " + name);
l.output();
}

5
spring-context/src/test/java/org/springframework/context/support/Logic.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.BeanNameAware;
public class Logic implements BeanNameAware {
@SuppressWarnings("unused")
private String name;
@SuppressWarnings("unused")
@@ -35,7 +36,7 @@ public class Logic implements BeanNameAware {
}
public void output() {
System.out.println("Bean " + name);
// System.out.println("Bean " + name);
}
}

8
spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.ProxyFactory;
@@ -198,9 +199,8 @@ class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
connector.start();
}
catch (BindException ex) {
System.out.println("Skipping remainder of JMX LazyConnectionToRemote test because binding to local port ["
+ port + "] failed: " + ex.getMessage());
return;
Assumptions.abort("Skipping remainder of JMX LazyConnectionToRemote test because binding to local port [" +
port + "] failed: " + ex.getMessage());
}
// should now be able to access data via the lazy proxy

7
spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.springframework.core.testfixture.net.TestSocketUtils;
@@ -56,9 +57,9 @@ class RemoteMBeanClientInterceptorTests extends MBeanClientInterceptorTests {
this.connectorServer.start();
}
catch (BindException ex) {
System.out.println("Skipping remote JMX tests because binding to local port ["
+ this.servicePort + "] failed: " + ex.getMessage());
runTests = false;
Assumptions.abort("Skipping remote JMX tests because binding to local port [" +
this.servicePort + "] failed: " + ex.getMessage());
}
}