From e9fb51bdd7373f447be091904a621be93462e82d Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 27 Jun 2016 12:08:48 +0200
Subject: [PATCH] Fix test

---
 .../metadata/ConfigurationMetadataTests.java  | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadataTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadataTests.java
index b4b579abf5..1e9e655c6f 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadataTests.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadataTests.java
@@ -34,46 +34,44 @@ public class ConfigurationMetadataTests {
 
 	@Test
 	public void toDashedCaseUpperCamelCaseSuffix() {
-		assertThat(toDashedCase("myDLQ"), is("my-d-l-q"));
+		assertThat(toDashedCase("myDLQ")).isEqualTo("my-d-l-q");
 	}
 
 	@Test
 	public void toDashedCaseUpperCamelCaseMiddle() {
-		assertThat(toDashedCase("someDLQKey"), is("some-d-l-q-key"));
+		assertThat(toDashedCase("someDLQKey")).isEqualTo("some-d-l-q-key");
 	}
 
 	@Test
 	public void toDashedCaseWordsUnderscore() {
 		assertThat(toDashedCase("Word_With_underscore"))
-				.isEqualTo("word_with_underscore");
+				.isEqualTo("word-with-underscore");
 	}
 
 	@Test
 	public void toDashedCaseWordsSeveralUnderscores() {
 		assertThat(toDashedCase("Word___With__underscore"))
-				.isEqualTo("word___with__underscore");
+				.isEqualTo("word---with--underscore");
 	}
 
 	@Test
 	public void toDashedCaseLowerCaseUnderscore() {
-		assertThat(toDashedCase("lower_underscore")).isEqualTo("lower_underscore");
+		assertThat(toDashedCase("lower_underscore")).isEqualTo("lower-underscore");
 	}
 
 	@Test
-	public void toDashedCaseUpperUnderscore() {
-		assertThat(toDashedCase("UPPER_UNDERSCORE")).isEqualTo("upper_underscore");
+	public void toDashedCaseUpperUnderscoreSuffix() {
+		assertThat(toDashedCase("my_DLQ")).isEqualTo("my-d-l-q");
+	}
+
+	@Test
+	public void toDashedCaseUpperUnderscoreMiddle() {
+		assertThat(toDashedCase("some_DLQ_key")).isEqualTo("some-d-l-q-key");
 	}
 
 	@Test
 	public void toDashedCaseMultipleUnderscores() {
-		assertThat(toDashedCase("super___crazy")).isEqualTo("super___crazy");
-	}
-
-	@Test
-	public void toDashedCaseUppercase() {
-		assertThat(toDashedCase("UPPERCASE")).isEqualTo("uppercase");
-	public void toDashedCaseMultipleUnderscores() {
-		assertThat(toDashedCase("super___crazy"), is("super---crazy"));
+		assertThat(toDashedCase("super___crazy")).isEqualTo("super---crazy");
 	}
 
 	@Test