[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openig-dev
Subject: [Openig-dev] [984] trunk/openig-core/src/test/java/org/forgerock/openig: Extracted method
From: noreply () forgerock ! org
Date: 2015-04-27 8:08:30
Message-ID: 20150427080830.4A18C3F86E () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[984] trunk/openig-core/src/test/java/org/forgerock/openig: Extracted method \
HeapImplTest.buildDefaultHeap() from HeapImplTest</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openig/?cs=984">984</a></dd> \
<dt>Author</dt> <dd>violette</dd> <dt>Date</dt> <dd>2015-04-27 09:08:30 +0100 (Mon, \
27 Apr 2015)</dd> </dl>
<h3>Log Message</h3>
<pre>Extracted method HeapImplTest.buildDefaultHeap() from HeapImplTest
to HeapUtilsTest class.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenigcoresrctestjavaorgforgerockopenigdecorationDecoratorSystemTes \
tjava">trunk/openig-core/src/test/java/org/forgerock/openig/decoration/DecoratorSystemTest.java</a></li>
<li><a href="#trunkopenigcoresrctestjavaorgforgerockopenighandlerrouterRouteBuilderTe \
stjava">trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteBuilderTest.java</a></li>
<li><a href="#trunkopenigcoresrctestjavaorgforgerockopenighandlerrouterRouterHandlerT \
estjava">trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java</a></li>
<li><a href="#trunkopenigcoresrctestjavaorgforgerockopenigheapHeapImplTestjava">trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapImplTest.java</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkopenigcoresrctestjavaorgforgerockopenigheapHeapUtilsTestjava">trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapUtilsTest.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenigcoresrctestjavaorgforgerockopenigdecorationDecoratorSystemTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openig-core/src/test/java/org/forgerock/openig/decoration/DecoratorSystemTest.java \
(983 => 984)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openig-core/src/test/java/org/forgerock/openig/decoration/DecoratorSystemTest.java 2015-04-25 \
07:05:18 UTC (rev 983)
+++ trunk/openig-core/src/test/java/org/forgerock/openig/decoration/DecoratorSystemTest.java 2015-04-27 \
08:08:30 UTC (rev 984) </span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> import static java.lang.String.*;
</span><span class="cx"> import static org.assertj.core.api.Assertions.*;
</span><span class="cx"> import static org.forgerock.http.util.Json.*;
</span><ins>+import static org.forgerock.openig.heap.HeapUtilsTest.*;
</ins><span class="cx">
</span><span class="cx"> import java.io.IOException;
</span><span class="cx"> import java.io.InputStreamReader;
</span><span class="lines">@@ -31,7 +32,6 @@
</span><span class="cx"> import org.forgerock.json.fluent.JsonValue;
</span><span class="cx"> import org.forgerock.openig.heap.HeapException;
</span><span class="cx"> import org.forgerock.openig.heap.HeapImpl;
</span><del>-import org.forgerock.openig.heap.HeapImplTest;
</del><span class="cx"> import org.forgerock.openig.heap.Name;
</span><span class="cx"> import org.forgerock.openig.http.Exchange;
</span><span class="cx"> import org.forgerock.util.Function;
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldDecorateObjectDeclaration() throws \
Exception { </span><del>- HeapImpl heap = HeapImplTest.buildDefaultHeap();
</del><ins>+ HeapImpl heap = buildDefaultHeap();
</ins><span class="cx"> heap.put("make-title", new \
MakeTitleDecorator()); </span><span class="cx">
</span><span class="cx"> JsonValue config = \
asJson("decorate-object-declaration.json"); </span><span class="lines">@@ \
-54,7 +54,7 @@ </span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldDecorateAllObjectDeclarations() throws \
Exception { </span><del>- HeapImpl heap = HeapImplTest.buildDefaultHeap();
</del><ins>+ HeapImpl heap = buildDefaultHeap();
</ins><span class="cx"> heap.put("make-title", new \
MakeTitleDecorator()); </span><span class="cx">
</span><span class="cx"> JsonValue config = \
asJson("decorate-all-object-declarations.json"); </span><span \
class="lines">@@ -67,7 +67,7 @@ </span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldDecorateTopLevelReference() throws \
Exception { </span><del>- HeapImpl heap = HeapImplTest.buildDefaultHeap();
</del><ins>+ HeapImpl heap = buildDefaultHeap();
</ins><span class="cx"> heap.put("make-title", new \
MakeTitleDecorator()); </span><span class="cx"> \
heap.init(asJson("decorate-top-level-reference.json")); </span><span \
class="cx"> </span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldDecorateTopLevelInlineReference() \
throws Exception { </span><del>- HeapImpl heap = \
HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl heap = \
buildDefaultHeap(); </ins><span class="cx"> heap.put("make-title", \
new MakeTitleDecorator()); </span><span class="cx"> JsonValue config = \
asJson("decorate-top-level-inline-reference.json"); </span><span \
class="cx"> heap.init(config); </span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldDecorateGetReferencesFromParentHeap() \
throws Exception { </span><del>- HeapImpl parent = \
HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl parent = \
buildDefaultHeap(); </ins><span class="cx"> \
parent.put("make-title", new MakeTitleDecorator()); </span><span \
class="cx"> parent.init(asJson("decorate-reference-from-parent-heap-parent.json"));
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void \
shouldDecorateResolvedReferencesFromParentHeap() throws Exception { </span><del>- \
HeapImpl parent = HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl \
parent = buildDefaultHeap(); </ins><span class="cx"> \
parent.put("make-title", new MakeTitleDecorator()); </span><span \
class="cx"> parent.init(asJson("decorate-reference-from-parent-heap-parent.json"));
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void \
shouldDecorateTopLevelGetReferencesFromParentHeap() throws Exception { </span><del>- \
HeapImpl parent = HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl \
parent = buildDefaultHeap(); </ins><span class="cx"> \
parent.put("make-title", new MakeTitleDecorator()); </span><span \
class="cx"> parent.init(asJson("decorate-reference-from-parent-heap-parent.json"));
</span><span class="cx">
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> // -> h3
</span><span class="cx"> // -> h4
</span><span class="cx">
</span><del>- HeapImpl h1 = HeapImplTest.buildDefaultHeap();
</del><ins>+ HeapImpl h1 = buildDefaultHeap();
</ins><span class="cx"> h1.put("make-title", new \
MakeTitleDecorator()); </span><span class="cx"> \
h1.init(asJson("decorate-reference-with-decorator-inheritance-1.json")); \
</span><span class="cx"> </span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void \
shouldDecorateObjectWithInheritedGlobalDecorator() throws Exception { </span><del>- \
HeapImpl parent = HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl \
parent = buildDefaultHeap(); </ins><span class="cx"> \
parent.put("make-title", new MakeTitleDecorator()); </span><span \
class="cx"> parent.init(asJson("decorate-object-with-inherited-global-decorator-parent.json"));
</span><span class="cx">
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void \
shouldDecorateObjectWithInheritedAndLocalGlobalDecorator() throws Exception { \
</span><del>- HeapImpl parent = HeapImplTest.buildDefaultHeap(); </del><ins>+ \
HeapImpl parent = buildDefaultHeap(); </ins><span class="cx"> \
parent.put("make-title", new MakeTitleDecorator()); </span><span \
class="cx"> parent.init(asJson("decorate-object-with-inherited-global-decorator-parent.json"));
</span><span class="cx">
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldApplyDecoratorsInTheRightOrder() \
throws Exception { </span><del>- HeapImpl heap = \
HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl heap = \
buildDefaultHeap(); </ins><span class="cx"> heap.put("make-title", \
new MakeTitleDecorator()); </span><span class="cx"> \
heap.init(asJson("decorate-top-level-reference-with-local-and-global-decorators.json"));
</span><span class="cx">
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldApplyDecoratorsInTheRightOrder2() \
throws Exception { </span><del>- HeapImpl one = \
HeapImplTest.buildDefaultHeap(); </del><ins>+ HeapImpl one = \
buildDefaultHeap(); </ins><span class="cx"> one.put("make-title", \
new MakeTitleDecorator()); </span><span class="cx"> \
one.init(asJson("decorate-object-in-order-with-inheritance-parent.json")); \
</span><span class="cx"> </span></span></pre></div>
<a id="trunkopenigcoresrctestjavaorgforgerockopenighandlerrouterRouteBuilderTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteBuilderTest.java \
(983 => 984)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteBuilderTest.java 2015-04-25 \
07:05:18 UTC (rev 983)
+++ trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteBuilderTest.java 2015-04-27 \
08:08:30 UTC (rev 984) </span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> import static org.assertj.core.api.Assertions.*;
</span><span class="cx"> import static org.forgerock.http.MutableUri.*;
</span><span class="cx"> import static org.forgerock.openig.handler.router.Files.*;
</span><del>-import static org.forgerock.openig.heap.HeapImplTest.*;
</del><ins>+import static org.forgerock.openig.heap.HeapUtilsTest.*;
</ins><span class="cx">
</span><span class="cx"> import java.io.IOException;
</span><span class="cx"> import java.util.HashMap;
</span></span></pre></div>
<a id="trunkopenigcoresrctestjavaorgforgerockopenighandlerrouterRouterHandlerTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java \
(983 => 984)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java 2015-04-25 \
07:05:18 UTC (rev 983)
+++ trunk/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java 2015-04-27 \
08:08:30 UTC (rev 984) </span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> import static java.util.Arrays.*;
</span><span class="cx"> import static org.assertj.core.api.Assertions.*;
</span><span class="cx"> import static org.forgerock.openig.handler.router.Files.*;
</span><del>-import static org.forgerock.openig.heap.HeapImplTest.*;
</del><ins>+import static org.forgerock.openig.heap.HeapUtilsTest.*;
</ins><span class="cx"> import static org.forgerock.util.Utils.*;
</span><span class="cx"> import static org.mockito.Mockito.*;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkopenigcoresrctestjavaorgforgerockopenigheapHeapImplTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapImplTest.java (983 => \
984)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapImplTest.java 2015-04-25 \
07:05:18 UTC (rev 983)
+++ trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapImplTest.java 2015-04-27 \
08:08:30 UTC (rev 984) </span><span class="lines">@@ -19,9 +19,7 @@
</span><span class="cx"> import static org.assertj.core.api.Assertions.*;
</span><span class="cx"> import static org.forgerock.http.util.Json.*;
</span><span class="cx"> import static org.forgerock.json.fluent.JsonValue.*;
</span><del>-import static \
org.forgerock.openig.decoration.baseuri.BaseUriDecorator.*;
-import static org.forgerock.openig.io.TemporaryStorage.*;
-import static org.forgerock.openig.log.LogSink.*;
</del><ins>+import static org.forgerock.openig.heap.HeapUtilsTest.*;
</ins><span class="cx">
</span><span class="cx"> import java.io.InputStreamReader;
</span><span class="cx"> import java.io.Reader;
</span><span class="lines">@@ -30,14 +28,11 @@
</span><span class="cx"> import org.forgerock.json.fluent.JsonValueException;
</span><span class="cx"> import org.forgerock.openig.decoration.Context;
</span><span class="cx"> import org.forgerock.openig.decoration.Decorator;
</span><del>-import org.forgerock.openig.decoration.baseuri.BaseUriDecorator;
</del><span class="cx"> import org.forgerock.openig.heap.domain.Book;
</span><span class="cx"> import org.forgerock.openig.heap.domain.DecoratorDecorator;
</span><span class="cx"> import org.forgerock.openig.heap.domain.ReferencedObject;
</span><span class="cx"> import org.forgerock.openig.heap.domain.TheOne;
</span><span class="cx"> import org.forgerock.openig.heap.domain.UseListOfReferences;
</span><del>-import org.forgerock.openig.io.TemporaryStorage;
-import org.forgerock.openig.log.NullLogSink;
</del><span class="cx"> import org.testng.annotations.Test;
</span><span class="cx">
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><span class="lines">@@ -377,14 +372,6 @@
</span><span class="cx"> return new JsonValue(readJson(reader));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public static HeapImpl buildDefaultHeap() throws Exception {
- HeapImpl heap = new HeapImpl();
- heap.put(TEMPORARY_STORAGE_HEAP_KEY, new TemporaryStorage());
- heap.put(LOGSINK_HEAP_KEY, new NullLogSink());
- heap.put(BASEURI_HEAP_KEY, new BaseUriDecorator());
- return heap;
- }
-
</del><span class="cx"> private static class BookDecorator implements Decorator {
</span><span class="cx">
</span><span class="cx"> @Override
</span></span></pre></div>
<a id="trunkopenigcoresrctestjavaorgforgerockopenigheapHeapUtilsTestjava"></a>
<div class="addfile"><h4>Added: \
trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapUtilsTest.java (0 => \
984)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapUtilsTest.java \
(rev 0)
+++ trunk/openig-core/src/test/java/org/forgerock/openig/heap/HeapUtilsTest.java 2015-04-27 \
08:08:30 UTC (rev 984) </span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in \
compliance with the + * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for \
the + * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file \
and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the \
following below the CDDL + * Header, with the fields enclosed by brackets [] replaced \
by your own identifying + * information: "Portions Copyright [year] [name of \
copyright owner]". + *
+ * Copyright 2015 ForgeRock AS.
+ */
+package org.forgerock.openig.heap;
+
+import static org.forgerock.openig.decoration.baseuri.BaseUriDecorator.*;
+import static org.forgerock.openig.io.TemporaryStorage.*;
+import static org.forgerock.openig.log.LogSink.*;
+
+import org.forgerock.openig.decoration.baseuri.BaseUriDecorator;
+import org.forgerock.openig.io.TemporaryStorage;
+import org.forgerock.openig.log.NullLogSink;
+
+/**
+ * Utility class for tests usage.
+ */
+public final class HeapUtilsTest {
+ /** Static methods only. */
+ private HeapUtilsTest() {
+ }
+
+ public static HeapImpl buildDefaultHeap() throws Exception {
+ HeapImpl heap = new HeapImpl();
+ heap.put(TEMPORARY_STORAGE_HEAP_KEY, new TemporaryStorage());
+ heap.put(LOGSINK_HEAP_KEY, new NullLogSink());
+ heap.put(BASEURI_HEAP_KEY, new BaseUriDecorator());
+ return heap;
+ }
+}
</ins></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
Openig-dev mailing list
Openig-dev@forgerock.org
https://lists.forgerock.org/mailman/listinfo/openig-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic