-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed RsWithType duplicating headers.
RsWithType will now also use RsWithoutHeader to make sure it replaces any previous types before adding the new one. I also added tests for RsWithType.
- Loading branch information
Yohann Ferreira
committed
May 14, 2015
1 parent
c0b445a
commit 76a5bee
Showing
2 changed files
with
75 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/** | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2015 Yegor Bugayenko | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included | ||
* in all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
package org.takes.rs; | ||
|
||
import com.google.common.base.Joiner; | ||
import java.io.IOException; | ||
import org.hamcrest.MatcherAssert; | ||
import org.hamcrest.Matchers; | ||
import org.junit.Test; | ||
|
||
/** | ||
* Test case for {@link RsWithType}. | ||
* @author Yohann Ferreira ([email protected]) | ||
* @version $Id$ | ||
* @since 0.16.9 | ||
*/ | ||
public final class RsWithTypeTest { | ||
|
||
/** | ||
* RsWithType can replace an existing type. | ||
* @throws IOException If a problem occurs. | ||
*/ | ||
@Test | ||
public void replaceTypeToResponse() throws IOException { | ||
final String type = "text/plain"; | ||
final String header = "Content-Type: "; | ||
MatcherAssert.assertThat( | ||
new RsPrint( | ||
new RsWithType( | ||
new RsWithType(new RsEmpty(), "text/xml"), | ||
type | ||
) | ||
).print(), | ||
Matchers.equalTo( | ||
Joiner.on("\r\n").join( | ||
"HTTP/1.1 200 OK", | ||
header + type, | ||
"", | ||
"" | ||
) | ||
) | ||
); | ||
} | ||
} |