test: pass existing tests

Author: fractalwrench

bugsnag-spring/src/main/java/com/bugsnag/BugsnagSpringConfiguration.java

@@ -8,8 +8,8 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.SpringVersion;
 
-import javax.annotation.PostConstruct;
 import java.util.Map;
+import javax.annotation.PostConstruct;
 
 /**
  * Configuration to integrate Bugsnag with Spring.

bugsnag-spring/src/main/java/com/bugsnag/SpringBootConfiguration.java

@@ -10,8 +10,8 @@
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
-import javax.servlet.ServletRequestListener;
 import java.util.Map;
+import javax.servlet.ServletRequestListener;
 
 /**
  * If spring-boot is loaded, add configuration specific to Spring Boot

bugsnag-spring/src/test/java/com/bugsnag/SpringMvcTest.java

@@ -157,16 +157,18 @@ public void requestMetadataSetCorrectly() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void springVersionSetCorrectly() {
         callRuntimeExceptionEndpoint();
 
         Report report = verifyAndGetReport(delivery);
 
         // Check that the Spring version is set as expected
-        @SuppressWarnings(value = "unchecked") Map<String, Object> deviceMetadata =
-                (Map<String, Object>) report.getMetaData().get("device");
-        assertEquals(SpringVersion.getVersion(), deviceMetadata.get("springVersion"));
-        assertEquals(SpringBootVersion.getVersion(), deviceMetadata.get("springBootVersion"));
+        Map<String, Object> deviceMetadata = report.getDevice();
+        Map<String, Object> runtimeVersions =
+                (Map<String, Object>) deviceMetadata.get("runtimeVersions");
+        assertEquals(SpringVersion.getVersion(), runtimeVersions.get("springFramework"));
+        assertEquals(SpringBootVersion.getVersion(), runtimeVersions.get("springBoot"));
     }
 
     @Test

bugsnag/src/test/java/com/bugsnag/SessionPayloadTest.java

@@ -63,7 +63,7 @@ public void testJsonSerialisation() {
 
         JsonNode device = rootNode.get("device");
         assertNotNull(device);
-        assertEquals(3, device.size());
+        assertEquals(4, device.size());
     }
 
 }