From 9300bee308b5f9d290c41175d957c327dd07ea4d Mon Sep 17 00:00:00 2001 From: rlynch2 Date: Mon, 24 Oct 2016 21:50:33 -0700 Subject: [PATCH] Fixed bug which returns incorrect version number on first request after remote repo is updated. Fixed circleci warnings. --- .../JGitEnvironmentRepositoryIntegrationTests.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java index 7a16ab5c..ec6fac2a 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.config.server.environment; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -399,13 +400,13 @@ public class JGitEnvironmentRepositoryIntegrationTests { String updatedRemoteVersion = remoteRef.getObjectId().getName(); //make sure our versions have been updated - Assert.assertEquals(updatedRemoteVersion, updatedLocalVersion); - Assert.assertNotEquals(updatedRemoteVersion, remoteVersion); - Assert.assertNotEquals(updatedLocalVersion, localVersion); + assertEquals(updatedRemoteVersion, updatedLocalVersion); + assertNotEquals(updatedRemoteVersion, remoteVersion); + assertNotEquals(updatedLocalVersion, localVersion); //make sure our environment also reflects the updated version //this used to have a bug - Assert.assertEquals(environment.getVersion(), updatedRemoteVersion); + assertEquals(environment.getVersion(), updatedRemoteVersion);