Move TestAppender to com.cloud.test and other cleanup

Author: syed

…stack/storage/resource/TestAppender.java …ver/src/com/cloud/test/TestAppender.javaservices/secondary-storage/server/test/org/apache/cloudstack/storage/resource/TestAppender.java renamed to server/src/com/cloud/test/TestAppender.java services/secondary-storage/server/test/org/apache/cloudstack/storage/resource/TestAppender.java renamed to server/src/com/cloud/test/TestAppender.java

@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.cloudstack.storage.resource;
+package com.cloud.test;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
@@ -25,13 +25,16 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
+import org.springframework.util.Assert;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.isNullOrEmpty;
@@ -42,7 +45,6 @@
 import static org.apache.log4j.Level.FATAL;
 import static org.apache.log4j.Level.INFO;
 import static org.apache.log4j.Level.OFF;
-import static org.junit.Assert.fail;
 
 /**
 *
@@ -75,6 +77,7 @@ protected void append(LoggingEvent loggingEvent) {
             }
         }
     }
+
     public void close() {
 // Do nothing ...
     }
@@ -92,9 +95,11 @@ public void assertMessagesLogged() {
             }
         }
         if (!unloggedPatterns.isEmpty()) {
-            fail(Joiner.on(",").join(unloggedPatterns));
+            //Raise an assert
+            Assert.isTrue(false, Joiner.on(",").join(unloggedPatterns));
         }
     }
+
     private static final class PatternResult {
         private final Pattern pattern;
         private boolean foundFlag = false;

services/secondary-storage/server/conf/log4j.xml

@@ -162,7 +162,7 @@
 
 public class NfsSecondaryStorageResource extends ServerResourceBase implements SecondaryStorageResource {
 
-    private static final Logger s_logger = Logger.getLogger(NfsSecondaryStorageResource.class);
+    public static final Logger s_logger = Logger.getLogger(NfsSecondaryStorageResource.class);
 
     private static final String TEMPLATE_ROOT_DIR = "template/tmpl";
     private static final String VOLUME_ROOT_DIR = "volumes";
@@ -619,8 +619,8 @@ protected Answer createTemplateFromSnapshot(CopyCommand cmd) {
                 return result;
             }
         }
-        s_logger.debug("Failed to create templat from snapshot");
-        return new CopyCmdAnswer("Unsupported prototcol");
+        s_logger.debug("Failed to create template from snapshot");
+        return new CopyCmdAnswer("Unsupported protocol");
     }
 
     /**
@@ -632,7 +632,6 @@ protected void cleanupStagingNfs(TemplateObjectTO newTemplate) {
             DeleteCommand deleteCommand = new DeleteCommand(newTemplate);
             execute(deleteCommand);
         } catch (Exception e) {
-            System.out.println("LOG EVENT ################");
             s_logger.debug("Failed to clean up staging area:", e);
         }
     }

services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

@@ -18,10 +18,10 @@
  */
 package org.apache.cloudstack.storage.resource;
 
+import com.cloud.test.TestAppender;
 import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
 import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -74,8 +74,7 @@ public void testCleanupStagingNfs() throws Exception{
         TestAppender.TestAppenderBuilder appenderBuilder = new TestAppender.TestAppenderBuilder();
         appenderBuilder.addExpectedPattern(Level.DEBUG, "Failed to clean up staging area:");
         TestAppender testLogAppender = appenderBuilder.build();
-        Logger testLogger = Logger.getLogger(NfsSecondaryStorageResource.class);
-        TestAppender.safeAddAppender(testLogger, testLogAppender);
+        TestAppender.safeAddAppender(NfsSecondaryStorageResource.s_logger, testLogAppender);
 
         spyResource.cleanupStagingNfs(mockTemplate);