Improve naming of fields and variables (#10242)

* Variable names to conform to naming convention.

* Use static constants where it makes sense

3 files changed, 3 insertions, 3 deletions

diff --git a/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java b/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java
index 7b492ad012..d7bc8f4c44 100644
--- a/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java
+++ b/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java
@@ -66,7 +66,7 @@ public class BeanPropertySetTest {
         // Simulate deserializing into a different JVM by clearing the instance
         // map
         Field instancesField = BeanPropertySet.class
-                .getDeclaredField("instances");
+                .getDeclaredField("INSTANCES");
         instancesField.setAccessible(true);
         Map<?, ?> instances = (Map<?, ?>) instancesField.get(null);
         instances.clear();
diff --git a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
index b4e4f95194..368595ef27 100644
--- a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
@@ -88,7 +88,7 @@ public class AbstractClientConnectorTest {
             NoSuchFieldException, SecurityException, InterruptedException,
             ClassNotFoundException {
         Field stateTypeCacheField = AbstractClientConnector.class
-                .getDeclaredField("stateTypeCache");
+                .getDeclaredField("STATE_TYPE_CACHE");
         stateTypeCacheField.setAccessible(true);
         Map<Class<?>, ?> stateTypeCache = (Map<Class<?>, ?>) stateTypeCacheField
                 .get(null);
diff --git a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
index 74b8ce7e6d..34d8de2fc6 100644
--- a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
+++ b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
@@ -77,7 +77,7 @@ public class CurrentInstanceTest {
     private ThreadLocal<Map<Class<?>, CurrentInstance>> getInternalCurrentInstanceVariable()
             throws SecurityException, NoSuchFieldException,
             IllegalAccessException {
-        Field f = CurrentInstance.class.getDeclaredField("instances");
+        Field f = CurrentInstance.class.getDeclaredField("INSTANCES");
         f.setAccessible(true);
         return (ThreadLocal<Map<Class<?>, CurrentInstance>>) f.get(null);
     }