You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/09/26 11:23:02 UTC

svn commit: r1390345 - in /karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression: KeepRuntimeFolderTest.java UnpackDirectoryTest.java

Author: cschneider
Date: Wed Sep 26 09:23:01 2012
New Revision: 1390345

URL: http://svn.apache.org/viewvc?rev=1390345&view=rev
Log:
KARAF-1871 Rename test and add assertion

Added:
    karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UnpackDirectoryTest.java
      - copied, changed from r1390311, karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KeepRuntimeFolderTest.java
Removed:
    karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KeepRuntimeFolderTest.java

Copied: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UnpackDirectoryTest.java (from r1390311, karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KeepRuntimeFolderTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UnpackDirectoryTest.java?p2=karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UnpackDirectoryTest.java&p1=karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KeepRuntimeFolderTest.java&r1=1390311&r2=1390345&rev=1390345&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KeepRuntimeFolderTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UnpackDirectoryTest.java Wed Sep 26 09:23:01 2012
@@ -17,12 +17,12 @@
 
 package org.apache.karaf.tooling.exam.regression;
 
-import static junit.framework.Assert.assertTrue;
 import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 
 import java.io.File;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -33,44 +33,21 @@ import org.ops4j.pax.exam.spi.reactors.A
 
 @RunWith(JUnit4TestRunner.class)
 @ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
-public class KeepRuntimeFolderTest {
+public class UnpackDirectoryTest {
+    final static String UNPACK_DIR_NAME = "unpackdirectorytest";
 
     @Configuration
     public Option[] config() {
         return new Option[]{ karafDistributionConfiguration().frameworkUrl(
             maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").versionAsInProject())
-            .unpackDirectory(new File("target/paxexam/unpack/")) };
+            .unpackDirectory(new File("target/" + UNPACK_DIR_NAME)) };
     }
 
     @Test
-    public void test() throws Exception {
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        assertTrue(true);
+    public void testCurrentDirectoryIsBelowUnpackDirectory() throws Exception {
+        File unpackDir = new File(".").getAbsoluteFile().getParentFile().getParentFile();
+        Assert.assertTrue(unpackDir.isDirectory());
+        Assert.assertEquals(UNPACK_DIR_NAME, unpackDir.getName());
     }
 
-    @Test
-    public void test2() throws Exception {
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        assertTrue(true);
-    }
 }