From a852ee41543ba4fbd71ac61a6f7eec7999f7f776 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 5 Jun 2014 17:04:58 +0900 Subject: [PATCH] Fix StompSubframeEncoderTest failure Motivation: StompSubframeEncoderTest fails because StompHeaders does not respect the order of the headers set. Modifications: Use LinkedHashMap instead of HashMap Result: Fixes test failures --- .../main/java/io/netty/handler/codec/stomp/StompHeaders.java | 4 ++-- .../netty/handler/codec/stomp/StompSubframeEncoderTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codec-stomp/src/main/java/io/netty/handler/codec/stomp/StompHeaders.java b/codec-stomp/src/main/java/io/netty/handler/codec/stomp/StompHeaders.java index 9f54dada32..c2413050a5 100644 --- a/codec-stomp/src/main/java/io/netty/handler/codec/stomp/StompHeaders.java +++ b/codec-stomp/src/main/java/io/netty/handler/codec/stomp/StompHeaders.java @@ -17,7 +17,7 @@ package io.netty.handler.codec.stomp; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -48,7 +48,7 @@ public class StompHeaders { public static final String CONTENT_LENGTH = "content-length"; public static final String CONTENT_TYPE = "content-type"; - private final Map> headers = new HashMap>(); + private final Map> headers = new LinkedHashMap>(); public boolean has(String key) { List values = headers.get(key); diff --git a/codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeEncoderTest.java b/codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeEncoderTest.java index 90402f285d..1407e8c0c9 100644 --- a/codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeEncoderTest.java +++ b/codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeEncoderTest.java @@ -43,8 +43,8 @@ public class StompSubframeEncoderTest { public void testFrameAndContentEncoding() { StompHeadersSubframe frame = new DefaultStompHeadersSubframe(StompCommand.CONNECT); StompHeaders headers = frame.headers(); - headers.set(StompHeaders.ACCEPT_VERSION, "1.1,1.2"); headers.set(StompHeaders.HOST, "stomp.github.org"); + headers.set(StompHeaders.ACCEPT_VERSION, "1.1,1.2"); channel.writeOutbound(frame); channel.writeOutbound(LastStompContentSubframe.EMPTY_LAST_CONTENT); ByteBuf aggregatedBuffer = Unpooled.buffer();