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-04-28 16:09:15 +02:00
parent 90ffa95b6a aabd685225
commit dfd74495bd
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.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"); * 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.
@@ -111,13 +111,13 @@ public class MockServletContext implements ServletContext {
private final Map<String, ServletContext> contexts = new HashMap<>(); private final Map<String, ServletContext> contexts = new HashMap<>();
private int majorVersion = 3; private int majorVersion = 6;
private int minorVersion = 1; private int minorVersion = 0;
private int effectiveMajorVersion = 3; private int effectiveMajorVersion = 6;
private int effectiveMinorVersion = 1; private int effectiveMinorVersion = 0;
private final Map<String, RequestDispatcher> namedRequestDispatchers = new HashMap<>(); private final Map<String, RequestDispatcher> namedRequestDispatchers = new HashMap<>();

8
spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
View File

@@ -105,10 +105,10 @@ class MockServletContextTests {
@Test @Test
void servletVersion() { void servletVersion() {
assertThat(servletContext.getMajorVersion()).isEqualTo(3); assertThat(servletContext.getMajorVersion()).isEqualTo(6);
assertThat(servletContext.getMinorVersion()).isEqualTo(1); assertThat(servletContext.getMinorVersion()).isEqualTo(0);
assertThat(servletContext.getEffectiveMajorVersion()).isEqualTo(3); assertThat(servletContext.getEffectiveMajorVersion()).isEqualTo(6);
assertThat(servletContext.getEffectiveMinorVersion()).isEqualTo(1); assertThat(servletContext.getEffectiveMinorVersion()).isEqualTo(0);
servletContext.setMajorVersion(4); servletContext.setMajorVersion(4);
servletContext.setMinorVersion(0); servletContext.setMinorVersion(0);

10
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.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"); * 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.
@@ -111,13 +111,13 @@ public class MockServletContext implements ServletContext {
private final Map<String, ServletContext> contexts = new HashMap<>(); private final Map<String, ServletContext> contexts = new HashMap<>();
private int majorVersion = 3; private int majorVersion = 6;
private int minorVersion = 1; private int minorVersion = 0;
private int effectiveMajorVersion = 3; private int effectiveMajorVersion = 6;
private int effectiveMinorVersion = 1; private int effectiveMinorVersion = 0;
private final Map<String, RequestDispatcher> namedRequestDispatchers = new HashMap<>(); private final Map<String, RequestDispatcher> namedRequestDispatchers = new HashMap<>();