Author: sklevenz
Date: Sat Mar 13 17:14:26 2010
New Revision: 922617
URL: http://svn.apache.org/viewvc?rev=922617&view=rev
Log:
bug in mock test fixed
Added:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/DataSetup.java
- copied, changed from r922601,
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/TestDataSetup.java
Removed:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/TestDataSetup.java
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/resources/mock.properties
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java?rev=922617&r1=922616&r2=922617&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/AbstractSessionTest.java
Sat Mar 13 17:14:26 2010
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFac
import org.apache.log4j.PropertyConfigurator;
import org.apache.opencmis.client.api.Session;
import org.apache.opencmis.client.api.SessionFactory;
+import org.apache.opencmis.client.runtime.mock.MockSessionFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -67,7 +68,9 @@ public abstract class AbstractSessionTes
SessionFactory factory = Fixture.getSessionFactory();
this.session = factory.createSession(Fixture.getParamter());
- Fixture.setUpTestData(this.session);
+ if (!(factory instanceof MockSessionFactory)) {
+ Fixture.setUpTestData(this.session);
+ }
}
@After
Copied:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/DataSetup.java
(from r922601,
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/TestDataSetup.java)
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/DataSetup.java?p2=incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/DataSetup.java&p1=incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/TestDataSetup.java&r1=922601&r2=922617&rev=922617&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/TestDataSetup.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/DataSetup.java
Sat Mar 13 17:14:26 2010
@@ -25,18 +25,15 @@ import java.util.UUID;
import org.apache.opencmis.client.provider.factory.CmisProviderFactory;
import org.apache.opencmis.commons.PropertyIds;
import org.apache.opencmis.commons.SessionParameter;
-import org.apache.opencmis.commons.enums.CmisProperties;
import org.apache.opencmis.commons.enums.UnfileObjects;
import org.apache.opencmis.commons.provider.CmisProvider;
import org.apache.opencmis.commons.provider.PropertiesData;
import org.apache.opencmis.commons.provider.PropertyData;
-import org.apache.opencmis.commons.provider.PropertyIdData;
-import org.apache.opencmis.commons.provider.PropertyStringData;
import org.apache.opencmis.commons.provider.RepositoryInfoData;
import org.apache.opencmis.util.repository.ObjectGenerator;
import org.junit.Assert;
-public class TestDataSetup {
+public class DataSetup {
private CmisProvider provider = null;
private String rootFolderId = null; // root
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java?rev=922617&r1=922616&r2=922617&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/Fixture.java
Sat Mar 13 17:14:26 2010
@@ -33,16 +33,9 @@ import java.util.Map.Entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.opencmis.client.api.Folder;
import org.apache.opencmis.client.api.Session;
import org.apache.opencmis.client.api.SessionFactory;
-import org.apache.opencmis.client.provider.factory.CmisProviderFactory;
-import org.apache.opencmis.commons.SessionParameter;
-import org.apache.opencmis.commons.enums.UnfileObjects;
import org.apache.opencmis.commons.exceptions.CmisRuntimeException;
-import org.apache.opencmis.commons.provider.CmisProvider;
-import org.apache.opencmis.util.repository.ObjectGenerator;
-import org.junit.Assert;
/**
* Definition of unit environment for running test cases. Default
implementation
@@ -98,7 +91,7 @@ public class Fixture {
/*
* test data setup
*/
- private static TestDataSetup testData = new TestDataSetup();
+ private static DataSetup testData = new DataSetup();
static {
Fixture.TEST_ROOT_FOLDER_NAME = "test_" +
UUID.randomUUID().toString();
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/resources/mock.properties
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/resources/mock.properties?rev=922617&r1=922616&r2=922617&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/resources/mock.properties
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/resources/mock.properties
Sat Mar 13 17:14:26 2010
@@ -1,4 +1,4 @@
-org.apache.opencmis.client.runtime.suite.session.factory=org.apache.opencmis.client.runtime.mock.MockSessionFactory
+org.apache.opencmis.client.runtime.test.session.factory=org.apache.opencmis.client.runtime.mock.MockSessionFactory
org.apache.opencmis.user=Mr. Mock
org.apache.opencmis.password=*mock#
