From d5f4d8ed60aea425c9374ed1ece62abf35cfe37b Mon Sep 17 00:00:00 2001 From: rlynch2 Date: Mon, 24 Oct 2016 17:49:08 -0700 Subject: [PATCH] Fixed bug which returns incorrect version number on first request after remote repo is updated. Corrected imports. --- ...GitEnvironmentRepositoryIntegrationTests.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 86ca92ad..7a16ab5c 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 @@ -16,6 +16,12 @@ 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.assertThat; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -51,8 +57,6 @@ import org.springframework.util.FileSystemUtils; import org.springframework.util.ResourceUtils; import org.springframework.util.StreamUtils; -import static org.junit.Assert.*; - /** * @author Dave Syer * @author Roy Clarkson @@ -395,13 +399,13 @@ public class JGitEnvironmentRepositoryIntegrationTests { String updatedRemoteVersion = remoteRef.getObjectId().getName(); //make sure our versions have been updated - assertEquals(updatedRemoteVersion, updatedLocalVersion); - assertNotEquals(updatedRemoteVersion, remoteVersion); - assertNotEquals(updatedLocalVersion, localVersion); + Assert.assertEquals(updatedRemoteVersion, updatedLocalVersion); + Assert.assertNotEquals(updatedRemoteVersion, remoteVersion); + Assert.assertNotEquals(updatedLocalVersion, localVersion); //make sure our environment also reflects the updated version //this used to have a bug - assertEquals(environment.getVersion(), updatedRemoteVersion); + Assert.assertEquals(environment.getVersion(), updatedRemoteVersion);