Author: tom.baeyens(a)jboss.com Date: 2010-01-22 06:50:49 -0500 (Fri, 22 Jan 2010) New Revision: 6121 Modified: projects/businesslink/.classpath projects/businesslink/pom.xml projects/businesslink/src/test/java/org/jbpm/businesslink/BusinessLinkTest.java Log: adding persistence Modified: projects/businesslink/.classpath =================================================================== --- projects/businesslink/.classpath 2010-01-22 11:50:24 UTC (rev 6120) +++ projects/businesslink/.classpath 2010-01-22 11:50:49 UTC (rev 6121) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry kind="src" path="src/test/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> Modified: projects/businesslink/pom.xml =================================================================== --- projects/businesslink/pom.xml 2010-01-22 11:50:24 UTC (rev 6120) +++ projects/businesslink/pom.xml 2010-01-22 11:50:49 UTC (rev 6121) @@ -30,54 +30,37 @@ <properties> <hibernate.version>3.3.1.GA</hibernate.version> - <junit.version>3.8.2</junit.version> - </properties> -<!-- - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <apache.ant.version>1.7.0</apache.ant.version> - <beanshell.version>2.0b5</beanshell.version> - <groovy.version>1.5.6</groovy.version> - <cactus.version>1.8.1</cactus.version> - <drools.version>5.0.1</drools.version> - <aspectjrt.version>1.5.3</aspectjrt.version> - <freemarker.version>2.3.15</freemarker.version> - <gwt.console.version>1.3.0</gwt.console.version> - <jbpm.gpd.version>4.3-SNAPSHOT</jbpm.gpd.version> - <slf4j.version>1.5.2</slf4j.version> <hsqldb.version>1.8.0.7</hsqldb.version> - <jboss.identity.version>1.0.0.Beta1</jboss.identity.version> - <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> - <jboss.client.version>5.0.1.GA</jboss.client.version> - <jsr233.version>2.0.5</jsr233.version> - <juel.version>2.1.0</juel.version> <junit.version>3.8.2</junit.version> - <log4j.version>1.2.14</log4j.version> - <mail.version>1.4.1</mail.version> - <report.engine.version>2.3.2</report.engine.version> - <servlet-api.version>2.5</servlet-api.version> - <signavio.jbpmeditor.version>1.1</signavio.jbpmeditor.version> - <spring.version>2.0.8</spring.version> - <stax.api.version>1.0.1</stax.api.version> - <wiser.version>1.2</wiser.version> - <woodstox.version>3.2.6</woodstox.version> - <hsqldb.version>1.8.0.7</hsqldb.version> - <mysql.connector.version>5.0.8</mysql.connector.version> - <postgresql.version>8.3-603.jdbc3</postgresql.version> - <jtds.version>1.2.2</jtds.version> - <oracle.version>10.2.0.4</oracle.version> - --> + <slf4j.version>1.5.2</slf4j.version> + </properties> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>${hsqldb.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.version}</version> + </dependency> + <dependency> <!-- added for hibernate --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> <!-- added for hibernate --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${slf4j.version}</version> + </dependency> </dependencies> <scm> Modified: projects/businesslink/src/test/java/org/jbpm/businesslink/BusinessLinkTest.java =================================================================== --- projects/businesslink/src/test/java/org/jbpm/businesslink/BusinessLinkTest.java 2010-01-22 11:50:24 UTC (rev 6120) +++ projects/businesslink/src/test/java/org/jbpm/businesslink/BusinessLinkTest.java 2010-01-22 11:50:49 UTC (rev 6121) @@ -21,8 +21,9 @@ import junit.framework.TestCase; import org.jbpm.businesslink.api.Artifact; -import org.jbpm.businesslink.internal.BusinessLinkServiceImpl; -import org.jbpm.businesslink.internal.file.FileRepository; +import org.jbpm.businesslink.test.BusinessLinkConfiguration; +import org.jbpm.businesslink.test.BusinessLinkSessionFactory; +import org.jbpm.businesslink.test.TestBusinessLinkSession; /** * @author Tom Baeyens @@ -33,36 +34,53 @@ private static String testSourcesPath = getTestSourcesPath(); + protected static BusinessLinkSessionFactory businessLinkSessionFactory = new BusinessLinkConfiguration() + .hibernateCfgResource("hibernate.cfg.xml") + .fileRepository("test-sources", testSourcesPath) + .buildBusinessLinkSessionFactory(); + + protected TestBusinessLinkSession session; + public void testJavaFile() throws Exception { - BusinessLinkServiceImpl greenLightService = new BusinessLinkServiceImpl(); - greenLightService.addRepository(new FileRepository("test-sources", testSourcesPath)); - - List<Artifact> artifacts = greenLightService.getArtifacts("test-sources/org/jbpm/businesslink"); + session = businessLinkSessionFactory.openSession(); + List<Artifact> artifacts = session.getArtifacts("test-sources/org/jbpm/businesslink"); + session.commit(); + assertNotNull(artifacts); assertFalse(artifacts.isEmpty()); Artifact artifact = artifacts.get(0); + assertEquals(".svn", artifact.getName()); + assertEquals(Artifact.ARTIFACTTYPE_DIRECTORY, artifact.getType()); + assertEquals("test-sources/org/jbpm/businesslink/.svn", artifact.getPath()); + + artifact = artifacts.get(1); assertEquals("BusinessLinkTest.java", artifact.getName()); assertEquals(".java", artifact.getType()); assertEquals("test-sources/org/jbpm/businesslink/BusinessLinkTest.java", artifact.getPath()); - assertEquals(1, artifacts.size()); + assertEquals(2, artifacts.size()); } public void testDirectory() throws Exception { - BusinessLinkServiceImpl greenLightService = new BusinessLinkServiceImpl(); - greenLightService.addRepository(new FileRepository("test-sources", testSourcesPath)); + session = businessLinkSessionFactory.openSession(); + List<Artifact> artifacts = session.getArtifacts("test-sources/org/jbpm"); + session.commit(); - List<Artifact> artifacts = greenLightService.getArtifacts("test-sources/org/jbpm"); assertNotNull(artifacts); assertFalse(artifacts.isEmpty()); Artifact artifact = artifacts.get(0); + assertEquals(".svn", artifact.getName()); + assertEquals(Artifact.ARTIFACTTYPE_DIRECTORY, artifact.getType()); + assertEquals("test-sources/org/jbpm/.svn", artifact.getPath()); + + artifact = artifacts.get(1); assertEquals("businesslink", artifact.getName()); assertEquals(Artifact.ARTIFACTTYPE_DIRECTORY, artifact.getType()); assertEquals("test-sources/org/jbpm/businesslink", artifact.getPath()); - assertEquals(1, artifacts.size()); + assertEquals(2, artifacts.size()); } private static String getTestSourcesPath() {