SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug which returns incorrect version number on first request after remote repo is updated. Corrected imports.

Browse Source
This commit is contained in:
rlynch2
2016-10-24 17:49:08 -07:00
parent 2a3c60feb4
commit d5f4d8ed60
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java
View File

@@ -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);