deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject git commit: DELTASPIKE-399 Cleaned up target dir, fixed license header.
Date Sun, 29 Dec 2013 15:11:23 GMT
Updated Branches:
  refs/heads/master 1620ea708 -> 2b7896eb8


DELTASPIKE-399 Cleaned up target dir, fixed license header.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2b7896eb
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2b7896eb
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2b7896eb

Branch: refs/heads/master
Commit: 2b7896eb806b7a36c6a05cb8b500f18f1af37759
Parents: 1620ea7
Author: John D. Ament <john.d.ament@gmail.com>
Authored: Sun Dec 29 10:11:12 2013 -0500
Committer: John D. Ament <john.d.ament@gmail.com>
Committed: Sun Dec 29 10:11:12 2013 -0500

----------------------------------------------------------------------
 .../resourceloader/ClasspathResourceTest.java     |  6 ------
 .../resourceloader/ClasspathWebProfileTest.java   | 18 ++++++++++++++++++
 .../impl/resourceloader/FileResourceTest.java     | 11 ++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2b7896eb/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
index 1fb0435..b5f3eb2 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
@@ -18,23 +18,17 @@
  */
 package org.apache.deltaspike.test.core.impl.resourceloader;
 
-
-import org.apache.deltaspike.core.api.literal.ExternalResourceLiteral;
 import org.apache.deltaspike.core.api.resourceloader.ClasspathStorage;
 import org.apache.deltaspike.core.api.resourceloader.ExternalResource;
 import org.apache.deltaspike.test.category.SeCategory;
 import org.apache.deltaspike.test.util.ArchiveUtils;
-import org.apache.deltaspike.test.utils.CdiContainerUnderTest;
-import org.apache.deltaspike.test.utils.CdiImplementation;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2b7896eb/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
index b565d6b..1f3b76e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
 package org.apache.deltaspike.test.core.impl.resourceloader;
 
 import org.apache.deltaspike.core.api.resourceloader.ClasspathStorage;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2b7896eb/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
index d0766a7..f1e162c 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
@@ -22,6 +22,7 @@ package org.apache.deltaspike.test.core.impl.resourceloader;
 import org.apache.deltaspike.core.api.resourceloader.ExternalResource;
 import org.apache.deltaspike.core.api.resourceloader.FileSystemStorage;
 import org.apache.deltaspike.core.util.ExceptionUtils;
+import org.apache.deltaspike.test.category.SeCategory;
 import org.apache.deltaspike.test.util.ArchiveUtils;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -32,9 +33,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
-import javax.inject.Inject;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -42,6 +43,7 @@ import java.io.InputStream;
 import java.util.Properties;
 
 @RunWith(Arquillian.class)
+@Category(SeCategory.class)
 public class FileResourceTest
 {
     private boolean created = false;
@@ -50,8 +52,7 @@ public class FileResourceTest
     {
         if (!created)
         {
-            String javaiotmpdir = System.getProperty("java.io.tmpdir","/tmp");
-            File tmpDir = new File(javaiotmpdir);
+            File tmpDir = new File("target");
             try
             {
                 File dest = new File(tmpDir,"/propsdsfileresource.properties");
@@ -82,7 +83,7 @@ public class FileResourceTest
 
     @Test
     public void testInputStream(@ExternalResource(storage=FileSystemStorage.class,
-            location="/tmp/propsdsfileresource.properties")
+            location="target/propsdsfileresource.properties")
             InputStream inputStream) throws IOException
     {
         Assert.assertNotNull(inputStream);
@@ -93,7 +94,7 @@ public class FileResourceTest
 
     @Test
     public void testProperties(@ExternalResource(storage=FileSystemStorage.class,
-            location="/tmp/propsdsfileresource.properties")
+            location="target/propsdsfileresource.properties")
             Properties properties)
     {
         Assert.assertEquals("somevalue", properties.getProperty("some.propertykey", "wrong
answer"));


Mime
View raw message