From aed3bb7e744ee88636eca3b71d227d882c2e08ab Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Tue, 27 Jul 2010 17:24:37 -0700
Subject: [PATCH] Issue 191: updated to include chef log and fixed tests

---
 .../org/jclouds/chef/ChefAsyncClientTest.java |   3 +-
 ...anupStaleNodesAndClientsImplLiveTest.java} |   2 +-
 chef/src/test/resources/log4j.xml             | 171 ++++++++++--------
 3 files changed, 101 insertions(+), 75 deletions(-)
 rename chef/src/test/java/org/jclouds/chef/strategy/internal/{CleanupStaleNodesAndClientsImplTest.java => CleanupStaleNodesAndClientsImplLiveTest.java} (96%)

diff --git a/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java b/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
index 9d3d1f5feb..7230ee0fb7 100644
--- a/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
+++ b/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
@@ -43,6 +43,7 @@ import org.jclouds.encryption.EncryptionService;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.http.functions.ParseJson;
+import org.jclouds.http.functions.ReleasePayloadAndReturn;
 import org.jclouds.http.functions.ReturnTrueIf2xx;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.RestClientTest;
@@ -294,7 +295,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
             "{\"name\":\"testnode\",\"normal\":{},\"override\":{},\"default\":{},\"automatic\":{},\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Node\",\"chef_type\":\"node\"}",
             "application/json", false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
diff --git a/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplTest.java b/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java
similarity index 96%
rename from chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplTest.java
rename to chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java
index 84f0499703..52feca0100 100644
--- a/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplTest.java
+++ b/chef/src/test/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImplLiveTest.java
@@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableSet;
  * @author Adrian Cole
  */
 @Test(groups = "live", testName = "chef.CleanupStaleNodesAndClientsImplLiveTest")
-public class CleanupStaleNodesAndClientsImplTest extends BaseChefStrategyLiveTest {
+public class CleanupStaleNodesAndClientsImplLiveTest extends BaseChefStrategyLiveTest {
    private CreateNodeAndPopulateAutomaticAttributesImpl creater;
    private CleanupStaleNodesAndClientsImpl strategy;
    private ChefClient chef;
diff --git a/chef/src/test/resources/log4j.xml b/chef/src/test/resources/log4j.xml
index 0e4fac1d4b..4cf98d7922 100644
--- a/chef/src/test/resources/log4j.xml
+++ b/chef/src/test/resources/log4j.xml
@@ -1,31 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
+<!--
 
 
-        Copyright (C) 2010 Cloud Conscious, LLC.
-        <info@cloudconscious.com>
+    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
 
-        ====================================================================
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
+    ====================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-        applicable law or agreed to in writing, software distributed
-        under the License is distributed on an "AS IS" BASIS, WITHOUT
-        WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions
-        and limitations under the License.
-        ====================================================================
-    -->
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ====================================================================
+
+-->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
-    <!--
-        For more configuration infromation and examples see the Apache
-        Log4j website: http://logging.apache.org/log4j/
-    -->
+	<!--
+		For more configuration infromation and examples see the Apache Log4j
+		website: http://logging.apache.org/log4j/
+	-->
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-    debug="false">
+	debug="false">
+
+    <!-- A time/date based rolling appender -->
+    <appender name="CHEFFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-chef.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+    
+    <appender name="ASYNCCHEF" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="CHEFFILE" />
+    </appender>
 
     <!-- A time/date based rolling appender -->
     <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
@@ -38,64 +65,56 @@
         <param name="Threshold" value="TRACE" />
 
         <layout class="org.apache.log4j.PatternLayout">
-            <!--
-                The default pattern: Date Priority [Category]
-                Message${symbol_escape}n
-            -->
+            <!-- The default pattern: Date Priority [Category] Message${symbol_escape}n -->
             <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
 
             <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message${symbol_escape}n <param
-                name="ConversionPattern" value="%d %-5r %-5p [%c]
-                (%t:%x) %m%n"/>
+                The full pattern: Date MS Priority [Category] (Thread:NDC) Message${symbol_escape}n
+                <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x)
+                %m%n"/>
             -->
         </layout>
     </appender>
 
-    <!-- A time/date based rolling appender -->
-    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!--
-                The default pattern: Date Priority [Category]
-                Message${symbol_escape}n
-            -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message${symbol_escape}n <param
-                name="ConversionPattern" value="%d %-5r %-5p [%c]
-                (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="FILE" />
-    </appender>
+  	<!-- A time/date based rolling appender -->
+  	<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+    		<param name="File" value="target/test-data/jclouds.log" />
+    		<param name="Append" value="true" />
+    
+    		<!-- Rollover at midnight each day -->
+    		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+    
+    		<param name="Threshold" value="TRACE" />
+    
+    		<layout class="org.apache.log4j.PatternLayout">
+      			<!-- The default pattern: Date Priority [Category] Message${symbol_escape}n -->
+      			<param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+      
+      			<!--
+      				The full pattern: Date MS Priority [Category] (Thread:NDC) Message${symbol_escape}n
+      				<param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x)
+      				%m%n"/>
+      			-->
+    		</layout>
+  	</appender>
+	
+  	<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+    		<appender-ref ref="FILE" />
+  	</appender>
 
     <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
         <appender-ref ref="WIREFILE" />
-    </appender>
-
-    <!-- ================ -->
-    <!-- Limit categories -->
-    <!-- ================ -->
-
-    <category name="org.jclouds">
-        <priority value="DEBUG" />
+    </appender>	
+    
+  	<!-- ================ -->
+  	<!-- Limit categories -->
+  	<!-- ================ -->
+  
+  	<category name="org.jclouds">
+    		<priority value="DEBUG" />
         <appender-ref ref="ASYNC" />
-    </category>
-
+   	</category>
+    
     <category name="jclouds.headers">
         <priority value="DEBUG" />
         <appender-ref ref="ASYNCWIRE" />
@@ -106,12 +125,18 @@
         <appender-ref ref="ASYNCWIRE" />
     </category>
 
-    <!-- ======================= -->
-    <!-- Setup the Root category -->
-    <!-- ======================= -->
+    <category name="jclouds.chef">
+        <priority value="TRACE" />
+        <appender-ref ref="ASYNCCHEF" />
+    </category>
 
-    <root>
-        <priority value="WARN" />
-    </root>
+    
+    <!-- ======================= -->
+  	<!-- Setup the Root category -->
+  	<!-- ======================= -->
+
+  	<root>
+    		<priority value="WARN" />
+  	</root>
 
 </log4j:configuration>
\ No newline at end of file