tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [2/7] incubator-tamaya git commit: Fixed most of the arquillian setup.
Date Fri, 27 Nov 2015 09:14:19 GMT
Fixed most of the arquillian setup.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/0fc8cc52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0fc8cc52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/0fc8cc52

Branch: refs/heads/master
Commit: 0fc8cc52ff5dfd635522a5bfb8e635b06cea2c72
Parents: 7d2e7d9
Author: anatole <anatole@apache.org>
Authored: Thu Nov 26 22:00:25 2015 +0100
Committer: anatole <anatole@apache.org>
Committed: Thu Nov 26 22:00:25 2015 +0100

----------------------------------------------------------------------
 .../META-INF/javaconfiguration.properties       | 18 -------------
 .../osgi/felix/src/test/resource/arquilian.xml  | 27 --------------------
 .../felix/src/test/resource/felix.properties    | 18 -------------
 .../osgi/base/TestConfigIntegration.java        | 14 ++++------
 .../META-INF/javaconfiguration.properties       | 18 +++++++++++++
 .../general/src/test/resources/arquillian.xml   | 27 ++++++++++++++++++++
 .../general/src/test/resources/felix.properties | 23 +++++++++++++++++
 7 files changed, 73 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/felix/src/test/resource/META-INF/javaconfiguration.properties
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/felix/src/test/resource/META-INF/javaconfiguration.properties
b/modules/integration/osgi/felix/src/test/resource/META-INF/javaconfiguration.properties
deleted file mode 100644
index b2b0d69..0000000
--- a/modules/integration/osgi/felix/src/test/resource/META-INF/javaconfiguration.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-#
-__tamaya-test__.tamaya-test-property=success!
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/felix/src/test/resource/arquilian.xml
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/felix/src/test/resource/arquilian.xml b/modules/integration/osgi/felix/src/test/resource/arquilian.xml
deleted file mode 100644
index d036dca..0000000
--- a/modules/integration/osgi/felix/src/test/resource/arquilian.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-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 current 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.
--->
-<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
-    <container qualifier="jboss" default="true">
-        <configuration>
-            <property name="frameworkProperties">/felix.properties</property>
-        </configuration>
-    </container>
-</arquillian>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/felix/src/test/resource/felix.properties
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/felix/src/test/resource/felix.properties b/modules/integration/osgi/felix/src/test/resource/felix.properties
deleted file mode 100644
index f81f6bc..0000000
--- a/modules/integration/osgi/felix/src/test/resource/felix.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-#
-org.osgi.framework.bootdelegation=org.osgi.service.cm;org.apache.felix.cm;org.apache.tamaya;org.apache.tamaya.spi;*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/general/src/test/java/org/apache/tamaya/integration/osgi/base/TestConfigIntegration.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/test/java/org/apache/tamaya/integration/osgi/base/TestConfigIntegration.java
b/modules/integration/osgi/general/src/test/java/org/apache/tamaya/integration/osgi/base/TestConfigIntegration.java
index 980180b..0b160b5 100644
--- a/modules/integration/osgi/general/src/test/java/org/apache/tamaya/integration/osgi/base/TestConfigIntegration.java
+++ b/modules/integration/osgi/general/src/test/java/org/apache/tamaya/integration/osgi/base/TestConfigIntegration.java
@@ -18,10 +18,10 @@
  */
 package org.apache.tamaya.integration.osgi.base;
 
+import org.apache.log4j.Priority;
 import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.spi.ServiceContext;
 import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.OperateOnDeployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.osgi.metadata.OSGiManifestBuilder;
@@ -30,12 +30,9 @@ import org.jboss.shrinkwrap.api.asset.Asset;
 import org.jboss.shrinkwrap.api.importer.ZipImporter;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
 
 import java.io.File;
 import java.io.InputStream;
@@ -47,13 +44,14 @@ public class TestConfigIntegration{
 
     private static final String TAMAYA_VERSION = "0.2-incubating-SNAPSHOT";
 
+
     @ArquillianResource BundleContext context;
 
     //////////////////////////////////////////////////////// Test setup //////////////////////////////////
 
-    @Deployment(order=11)
+    @Deployment
     public static JavaArchive createdeployment() {
-        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "tamaya-osgi-base.jar");
+        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "tamaya-osgi-general.jar");
         archive.setManifest(new Asset() {
             public InputStream openStream() {
                 OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
@@ -65,8 +63,7 @@ public class TestConfigIntegration{
                 return builder.openStream();
             }
         });
-        archive.addClasses(TestConfigIntegration.class);
-//        archive.addAsResource("META-INF/javaconfiguration.properties");
+        archive.addClasses(Test.class, TestConfigIntegration.class, Priority.class);
         return archive;
     }
 
@@ -125,7 +122,6 @@ public class TestConfigIntegration{
 //        }
 //    }
 
-    @OperateOnDeployment("_DEFAULT_")
     @Test
     public void testTamayaAvailable() throws Exception {
         assertNotNull(ConfigurationProvider.getConfiguration());

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/general/src/test/resources/META-INF/javaconfiguration.properties
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/test/resources/META-INF/javaconfiguration.properties
b/modules/integration/osgi/general/src/test/resources/META-INF/javaconfiguration.properties
new file mode 100644
index 0000000..b2b0d69
--- /dev/null
+++ b/modules/integration/osgi/general/src/test/resources/META-INF/javaconfiguration.properties
@@ -0,0 +1,18 @@
+# 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.
+#
+__tamaya-test__.tamaya-test-property=success!
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/general/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/test/resources/arquillian.xml b/modules/integration/osgi/general/src/test/resources/arquillian.xml
new file mode 100644
index 0000000..284e964
--- /dev/null
+++ b/modules/integration/osgi/general/src/test/resources/arquillian.xml
@@ -0,0 +1,27 @@
+<!--
+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 current 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.
+-->
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <container qualifier="jboss" default="true">
+        <configuration>
+            <property name="frameworkProperties">src/test/resources/felix.properties</property>
+        </configuration>
+    </container>
+</arquillian>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0fc8cc52/modules/integration/osgi/general/src/test/resources/felix.properties
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/test/resources/felix.properties b/modules/integration/osgi/general/src/test/resources/felix.properties
new file mode 100644
index 0000000..089ebf4
--- /dev/null
+++ b/modules/integration/osgi/general/src/test/resources/felix.properties
@@ -0,0 +1,23 @@
+# 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.
+#
+# org.osgi.service.cm;org.apache.felix.cm;org.apache.tamaya;org.apache.tamaya.spi;
+org.osgi.framework.bootdelegation=org.apache.tamaya.integration.osgi.base.TestConfigIntegration
+felix.log.level=4  #debug logging
+# felix.auto.deploy.dir=../test-bundles
+org.osgi.framework.storage=target/felix-cache
+felix.fileinstall.dir=../test-bundles
\ No newline at end of file


Mime
View raw message