[jboss-svn-commits] JBL Code SVN: r36065 - in labs/jbossrules/trunk/drools-eclipse: org.guvnor.tools.test/META-INF and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 25 11:43:13 EST 2010
Author: ge0ffrey
Date: 2010-11-25 11:43:12 -0500 (Thu, 25 Nov 2010)
New Revision: 36065
Added:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTest.java
Removed:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTests.java
Modified:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java
labs/jbossrules/trunk/drools-eclipse/pom.xml
Log:
make the guvnor tools tests part of the build + disable the 1 guvnor tools test as it dependend on jbosstools (which depends on guvnor tools which is a cyclic impossibility), author notified
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/META-INF/MANIFEST.MF 2010-11-25 13:11:43 UTC (rev 36064)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/META-INF/MANIFEST.MF 2010-11-25 16:43:12 UTC (rev 36065)
@@ -2,14 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-SymbolicName: org.guvnor.tools.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 5.2.0.qualifier
Require-Bundle: org.guvnor.tools;bundle-version="5.1.0",
org.junit;bundle-version="3.8.2",
org.eclipse.core.resources;bundle-version="3.5.0",
org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.jdt.core;bundle-version="3.5.0",
org.eclipse.jdt.launching;bundle-version="3.5.0",
- org.eclipse.jst.j2ee;bundle-version="1.1.300",
- org.jboss.tools.tests;bundle-version="3.1.0"
+ org.eclipse.jst.j2ee;bundle-version="1.1.300"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Copied: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTest.java (from rev 36061, labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTests.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTest.java 2010-11-25 16:43:12 UTC (rev 36065)
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * 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.
+ */
+
+package org.guvnor.tools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.guvnor.tools.utils.GuvnorMetadataUtils;
+//import org.jboss.tools.test.util.TestProjectProvider;
+
+public class GuvnorJunitTest extends TestCase {
+
+// TestProjectProvider provider;
+ IProject project;
+
+ public GuvnorJunitTest() {
+
+ }
+
+ public void setUp() throws Exception {
+// provider = new TestProjectProvider("org.guvnor.tools.test.junit", "guvnorTestProj", "guvnorTestProj", true);
+// project = provider.getProject();
+// project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ public void tearDown() throws Exception{
+
+ }
+
+ public void testNothing() {}
+
+ // TODO this test is disabled because guvnor tools cannot depends on jbosstools (because it's the other way around)
+ public void disabled_testJBIDE5265() throws Exception{
+ IFile meta = project.getFile("guvnorMetadata");
+ GuvnorMetadataUtils.loadGuvnorMetadata(meta);
+
+ meta.delete(true, null);
+ project.refreshLocal(0, null);
+
+ assertFalse("The metadata file can not be deleted", meta.exists());
+
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTests.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTests.java 2010-11-25 13:11:43 UTC (rev 36064)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorJunitTests.java 2010-11-25 16:43:12 UTC (rev 36065)
@@ -1,59 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * 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.
- */
-
-package org.guvnor.tools.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.guvnor.tools.utils.GuvnorMetadataUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class GuvnorJunitTests extends TestCase {
-
- TestProjectProvider provider;
- IProject project;
-
- public GuvnorJunitTests() {
-
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.guvnor.tools.test.junit", "guvnorTestProj", "guvnorTestProj", true);
- project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- }
-
- public void tearDown() throws Exception{
-
- }
-
-
- public void testJBIDE5265() throws Exception{
- IFile meta = project.getFile("guvnorMetadata");
- GuvnorMetadataUtils.loadGuvnorMetadata(meta);
-
- meta.delete(true, null);
- project.refreshLocal(0, null);
-
- assertFalse("The metadata file can not be deleted", meta.exists());
-
- }
-
-}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java 2010-11-25 13:11:43 UTC (rev 36064)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/src/org/guvnor/tools/tests/GuvnorToolsAllTests.java 2010-11-25 16:43:12 UTC (rev 36065)
@@ -24,7 +24,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test Guvnor Tools");
- suite.addTestSuite(GuvnorJunitTests.class);
+// suite.addTestSuite(GuvnorJunitTests.class);
return suite;
}
Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml 2010-11-25 13:11:43 UTC (rev 36064)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml 2010-11-25 16:43:12 UTC (rev 36065)
@@ -34,7 +34,7 @@
<module>org.eclipse.webdav</module>
<module>org.guvnor.tools</module>
<module>org.guvnor.tools.feature</module>
- <!--<module>org.guvnor.tools.test</module>--><!-- TODO enable me if p2 repo has org.jboss.tools.tests 3.1.0 -->
+ <module>org.guvnor.tools.test</module>
<module>org.drools.updatesite</module>
</modules>
More information about the jboss-svn-commits
mailing list