Author: sklevenz
Date: Fri Mar 19 08:18:28 2010
New Revision: 925130
URL: http://svn.apache.org/viewvc?rev=925130&view=rev
Log:
Unit test cases for r/w introduced
Added:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/WriteObjectTest.java
(with props)
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/java/org/apache/opencmis/client/runtime/FixtureSetup.java
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/ReadOnlySessionTest.java
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/mock/MockSessionFactory.java
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-provider-impl/src/test/java/org/apache/opencmis/client/provider/atompub/SimpleReadWriteTests.java
incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-api/src/main/java/org/apache/opencmis/commons/SessionParameter.java
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=925130&r1=925129&r2=925130&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
Fri Mar 19 08:18:28 2010
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.opencmis.client.api.ObjectId;
import org.apache.opencmis.client.api.Session;
import org.apache.opencmis.client.api.SessionFactory;
import org.apache.opencmis.client.runtime.mock.MockSessionFactory;
@@ -75,6 +76,9 @@ public abstract class AbstractSessionTes
@After
public void tearDown() throws Exception {
- Fixture.teardownTestData(this.session);
+ SessionFactory factory = Fixture.getSessionFactory();
+ if (!(factory instanceof MockSessionFactory)) {
+ Fixture.teardownTestData(this.session);
+ }
}
}
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=925130&r1=925129&r2=925130&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
Fri Mar 19 08:18:28 2010
@@ -22,9 +22,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
@@ -33,6 +30,7 @@ import java.util.Map.Entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.opencmis.client.api.ObjectId;
import org.apache.opencmis.client.api.Session;
import org.apache.opencmis.client.api.SessionFactory;
import org.apache.opencmis.commons.exceptions.CmisRuntimeException;
@@ -50,7 +48,8 @@ public class Fixture {
/*
* general
*/
- public static String TEST_ROOT_FOLDER_NAME = "test_" +
UUID.randomUUID().toString();
+ public static String TEST_ROOT_FOLDER_NAME = "test_"
+ + UUID.randomUUID().toString();
/*
* test data setup
@@ -107,7 +106,8 @@ public class Fixture {
public static void init() {
/* get optional path from system properties */
- String pathname =
System.getProperty(FixtureSessionParameter.CONFIG_PATH);
+ String pathname = System
+
.getProperty(FixtureSessionParameter.CONFIG_PATH);
pathname = (pathname != null) ? pathname.trim() : null;
Properties properties = null;
Map<String, String> sessionParameter = null;
@@ -193,4 +193,8 @@ public class Fixture {
}
}
+ public static String getTestRootId() {
+ return Fixture.testData.getTestRootId();
+ }
+
}
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/FixtureSetup.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/FixtureSetup.java?rev=925130&r1=925129&r2=925130&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/FixtureSetup.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/FixtureSetup.java
Fri Mar 19 08:18:28 2010
@@ -20,7 +20,6 @@ package org.apache.opencmis.client.runti
import java.util.ArrayList;
import java.util.List;
-import java.util.UUID;
import org.apache.opencmis.client.provider.factory.CmisProviderFactory;
import org.apache.opencmis.commons.PropertyIds;
@@ -41,11 +40,8 @@ public class FixtureSetup {
private String repositoryId = null;
public void teardown() {
- if (this.testRootFolderId != null) {
-
this.provider.getObjectService().deleteTree(this.repositoryId,
- this.testRootFolderId, true,
UnfileObjects.DELETE, true,
- null);
- }
+ this.provider.getObjectService().deleteTree(this.repositoryId,
+ this.testRootFolderId, true,
UnfileObjects.DELETE, true, null);
}
public void setup() {
@@ -57,10 +53,6 @@ public class FixtureSetup {
Fixture.getParamter());
Assert.assertNotNull(this.provider);
- ObjectGenerator og = new
ObjectGenerator(provider.getObjectFactory(),
- provider.getNavigationService(),
provider.getObjectService(),
- this.repositoryId);
-
// root folder
if (Fixture.getParamter().containsKey(
FixtureSessionParameter.TEST_ROOT_FOLDER_ID)) {
@@ -70,7 +62,7 @@ public class FixtureSetup {
Assert.assertNotNull(this.rootFolderId);
} else {
RepositoryInfoData rid =
this.provider.getRepositoryService()
- .getRepositoryInfo(repositoryId, null);
+ .getRepositoryInfo(this.repositoryId,
null);
Assert.assertNotNull(rid);
this.rootFolderId = rid.getRootFolderId();
Assert.assertNotNull(this.rootFolderId);
@@ -92,10 +84,15 @@ public class FixtureSetup {
PropertiesData properties = this.provider.getObjectFactory()
.createPropertiesData(propList);
- this.testRootFolderId =
this.provider.getObjectService().createFolder(this.repositoryId, properties,
- this.rootFolderId, null, null, null, null);
+ this.testRootFolderId =
this.provider.getObjectService().createFolder(
+ this.repositoryId, properties,
this.rootFolderId, null, null,
+ null, null);
Assert.assertNotNull(this.testRootFolderId);
-
+
+ ObjectGenerator og = new
ObjectGenerator(provider.getObjectFactory(),
+ provider.getNavigationService(),
provider.getObjectService(),
+ this.repositoryId);
+
og.setContentSizeInKB(10);
og.setDocumentTypeId(documentTypeId);
og.setFolderTypeId(folderTypeId);
@@ -105,5 +102,12 @@ public class FixtureSetup {
og.createFolderHierachy(2, 2, this.testRootFolderId);
}
-
+
+ public String getTestRootId() {
+ if (this.testRootFolderId == null) {
+ this.testRootFolderId = Fixture.TEST_ROOT_FOLDER_NAME;
+ }
+ return this.testRootFolderId;
+ }
+
}
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/ReadOnlySessionTest.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/ReadOnlySessionTest.java?rev=925130&r1=925129&r2=925130&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/ReadOnlySessionTest.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/ReadOnlySessionTest.java
Fri Mar 19 08:18:28 2010
@@ -28,25 +28,24 @@ import org.junit.Test;
*/
public class ReadOnlySessionTest extends AbstractSessionTest {
- @Test
- public void testSession() {
- Assert.assertNotNull(this.session.getDefaultContext());
- Assert.assertNotNull(this.session.getLocale());
- Assert.assertNotNull(this.session.getObjectFactory());
- Assert.assertNotNull(this.session.getRepositoryInfo());
- }
+ @Test
+ public void testSession() {
+ Assert.assertNotNull(this.session.getDefaultContext());
+ Assert.assertNotNull(this.session.getLocale());
+ Assert.assertNotNull(this.session.getObjectFactory());
+ Assert.assertNotNull(this.session.getRepositoryInfo());
+ }
- @Test
- public void testSessionObjectAccess() {
- Folder root = this.session.getRootFolder();
- Assert.assertNotNull(root);
- String id = root.getId();
- //Assert.assertNotNull(this.session.getObject(objectId));
- }
+ @Test
+ public void testSessionObjectAccess() {
+ Folder root = this.session.getRootFolder();
+ Assert.assertNotNull(root);
+ String id = root.getId();
+ }
- @Test
- public void testSessionClear() {
- this.session.clear();
- }
+ @Test
+ public void testSessionClear() {
+ this.session.clear();
+ }
}
Added:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/WriteObjectTest.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/WriteObjectTest.java?rev=925130&view=auto
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/WriteObjectTest.java
(added)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/WriteObjectTest.java
Fri Mar 19 08:18:28 2010
@@ -0,0 +1,150 @@
+/*
+ * 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.opencmis.client.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import junit.framework.Assert;
+
+import org.apache.opencmis.client.api.Ace;
+import org.apache.opencmis.client.api.ObjectId;
+import org.apache.opencmis.client.api.Policy;
+import org.apache.opencmis.client.api.Property;
+import org.apache.opencmis.client.api.objecttype.ObjectType;
+import org.apache.opencmis.commons.api.PropertyDefinition;
+import org.apache.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.opencmis.commons.enums.CmisProperties;
+import org.junit.Test;
+
+public class WriteObjectTest extends AbstractSessionTest {
+
+ @Test
+ public void createFolder() {
+ ObjectId parentId = this.session
+ .createObjectId(Fixture.getTestRootId());
+ String folderName = UUID.randomUUID().toString();
+ String typeId = FixtureData.FOLDER_TYPE_ID.value();
+
+ ObjectType ot = this.session.getTypeDefinition(typeId);
+ Map<String, PropertyDefinition<?>> pdefs =
ot.getPropertyDefintions();
+ List<Property<?>> properties = new ArrayList<Property<?>>();
+ Property<?> prop = null;
+
+ for (PropertyDefinition<?> pd : pdefs.values()) {
+ try {
+ CmisProperties cmisp =
CmisProperties.fromValue(pd.getId());
+ switch (cmisp) {
+ case NAME:
+ prop =
this.session.getObjectFactory().createProperty(
+
(PropertyDefinition<String>) pd, folderName);
+ properties.add(prop);
+ break;
+ case OBJECT_TYPE_ID:
+ prop =
this.session.getObjectFactory().createProperty(
+
(PropertyDefinition<String>) pd, typeId);
+ properties.add(prop);
+ break;
+ default:
+ break;
+ }
+ } catch (Exception e) {
+ // custom property definition
+ }
+
+ }
+
+ List<Ace> addAce = new ArrayList<Ace>();
+ List<Ace> removeAce = new ArrayList<Ace>();
+ List<Policy> policies = new ArrayList<Policy>();
+ ObjectId id = this.session.createFolder(properties, parentId,
policies,
+ addAce, removeAce);
+ Assert.assertNotNull(id);
+ }
+
+ /**
+ * Method to create named and typed folder using a given parent id.
+ *
+ * @param foldeName
+ * Name of folder to create
+ * @param parentId
+ * Id of parent folder to create this folder as a child
+ */
+ @SuppressWarnings("unchecked")
+ public void createFolder(String folderName, ObjectId parentId) {
+ // retrieve all property definitions for specific cmis type
+ ObjectType ot = this.session.getTypeDefinition("cmis:folder");
+ Map<String, PropertyDefinition<?>> pdefs =
ot.getPropertyDefintions();
+
+ // get property definitions from object type
+ PropertyDefinition<String> pdName =
(PropertyDefinition<String>) pdefs
+ .get(CmisProperties.NAME.value());
+ PropertyDefinition<String> pdType =
(PropertyDefinition<String>) pdefs
+ .get(CmisProperties.OBJECT_TYPE_ID.value());
+
+ // create mandatory properties of object type
+ Property<?> propName =
this.session.getObjectFactory().createProperty(
+ pdName, folderName);
+ Property<?> propType =
this.session.getObjectFactory().createProperty(
+ pdType, "cmis:folder");
+
+ // fill properties list
+ List<Property<?>> properties = new ArrayList<Property<?>>();
+ properties.add(propName);
+ properties.add(propType);
+
+ // create additional optional parameter
+ List<Ace> ace = new ArrayList<Ace>();
+ List<Policy> pol = null;
+
+ // ready steady go
+ ObjectId id = this.session.createFolder(properties, parentId,
pol, ace,
+ ace);
+ Assert.assertNotNull(id);
+ }
+
+ // public void createFolderOptimzed(String folderName, ObjectId
parentId) {
+ // // retrieve all property definitions for specific cmis type
+ // ObjectType ot =
+ // this.session.getTypeDefinition(BaseObjectTypeIds.CMIS_FOLDER);
+ // Map<String, PropertyDefinition<?>> pdefs =
ot.getPropertyDefintions();
+ //
+ // // get property definitions from object type
+ // PropertyDefinition<?> pdName = pdefs.get(CmisProperties.NAME);
+ // PropertyDefinition<?> pdType =
pdefs.get(CmisProperties.OBJECT_TYPE_ID);
+ //
+ // // create mandatory properties of object type
+ // Property<?> propName =
this.session.getObjectFactory().createProperty(
+ // pdName, folderName);
+ // Property<?> propType =
this.session.getObjectFactory().createProperty(
+ // pdType, "cmis:folder");
+ //
+ // // fill properties list
+ // List<Property<?>> properties = new ArrayList<Property<?>>();
+ // properties.add(propName);
+ // properties.add(propType);
+ //
+ // // ready steady go
+ // ObjectId id = this.session.createFolder(properties, parentId);
+ // Assert.assertNotNull(id);
+ // }
+
+}
Propchange:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/WriteObjectTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/mock/MockSessionFactory.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/mock/MockSessionFactory.java?rev=925130&r1=925129&r2=925130&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/mock/MockSessionFactory.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/test/java/org/apache/opencmis/client/runtime/mock/MockSessionFactory.java
Fri Mar 19 08:18:28 2010
@@ -18,6 +18,7 @@
*/
package org.apache.opencmis.client.runtime.mock;
+import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
@@ -29,6 +30,7 @@ import java.util.Calendar;
import java.util.Collections;
import java.util.Enumeration;
import java.util.GregorianCalendar;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -36,6 +38,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.UUID;
+import org.apache.opencmis.client.api.Ace;
import org.apache.opencmis.client.api.ChangeEvent;
import org.apache.opencmis.client.api.CmisObject;
import org.apache.opencmis.client.api.ContentStream;
@@ -44,6 +47,7 @@ import org.apache.opencmis.client.api.Fi
import org.apache.opencmis.client.api.Folder;
import org.apache.opencmis.client.api.ObjectId;
import org.apache.opencmis.client.api.OperationContext;
+import org.apache.opencmis.client.api.Policy;
import org.apache.opencmis.client.api.Property;
import org.apache.opencmis.client.api.QueryResult;
import org.apache.opencmis.client.api.Session;
@@ -63,6 +67,7 @@ import org.apache.opencmis.client.runtim
import org.apache.opencmis.client.runtime.FixtureData;
import org.apache.opencmis.commons.PropertyIds;
import org.apache.opencmis.commons.SessionParameter;
+import org.apache.opencmis.commons.api.PropertyDefinition;
import org.apache.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.opencmis.commons.enums.CapabilityAcl;
import org.apache.opencmis.commons.enums.CapabilityChanges;
@@ -131,6 +136,7 @@ public class MockSessionFactory implemen
return session;
}
+ @SuppressWarnings("unchecked")
private Session createMockSession() {
this.createMockGlobalTypes();
@@ -236,11 +242,28 @@ public class MockSessionFactory implemen
this.makeObjectsAccessible(session);
+ /*
+ * WRITE SUPPORT
+ */
+ expect(
+ session.createFolder((List<Property<?>>)
anyObject(),
+ (ObjectId) anyObject(),
(List<Policy>) anyObject(),
+ (List<Ace>) anyObject(),
(List<Ace>) anyObject()))
+
.andReturn(this.createMockObjectId()).anyTimes();
+
replay(session);
return session;
}
+ private ObjectId createMockObjectId() {
+ ObjectId id = createNiceMock(ObjectId.class);
+
+ replay(id);
+
+ return id;
+ }
+
private List<ChangeEvent> createMockChangeEvents() {
List<ChangeEvent> cel = new ArrayList<ChangeEvent>();
ChangeEvent ce = createNiceMock(ChangeEvent.class);
@@ -399,13 +422,16 @@ public class MockSessionFactory implemen
.andReturn(p1.getValue()).anyTimes();
/* multi valued property */
- Property<Object> p2 = (Property<Object>)
createMockMultiValuedStringProperty(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED.toString());
-
expect(o.getProperty(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED.toString()))
- .andReturn(p2).anyTimes();
+ Property<Object> p2 = (Property<Object>)
createMockMultiValuedStringProperty(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
+ .toString());
+ expect(
+
o.getProperty(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
+
.toString())).andReturn(p2).anyTimes();
expect(
o
-
.getPropertyMultivalue(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED.toString()))
- .andReturn(p2.getValues()).anyTimes();
+
.getPropertyMultivalue(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
+
.toString())).andReturn(p2.getValues())
+ .anyTimes();
}
}
@@ -414,8 +440,8 @@ public class MockSessionFactory implemen
Property<String> p = createNiceMock(StringProperty.class);
expect(p.getType()).andReturn(PropertyType.STRING).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_STRING)
- .anyTimes();
+ expect(p.getValue())
+
.andReturn(MockSessionFactory.PROPERTY_VALUE_STRING).anyTimes();
expect(p.isMultiValued()).andReturn(true).anyTimes();
List<String> v = new ArrayList<String>();
v.add(MockSessionFactory.PROPERTY_VALUE_STRING);
@@ -432,10 +458,11 @@ public class MockSessionFactory implemen
Property<Calendar> p = createNiceMock(DateTimeProperty.class);
expect(p.getType()).andReturn(PropertyType.DATETIME).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_DATETIME)
- .anyTimes();
+ expect(p.getValue()).andReturn(
+
MockSessionFactory.PROPERTY_VALUE_DATETIME).anyTimes();
expect(p.getValueAsString()).andReturn(
-
MockSessionFactory.PROPERTY_VALUE_DATETIME.toString()).anyTimes();
+
MockSessionFactory.PROPERTY_VALUE_DATETIME.toString())
+ .anyTimes();
replay(p);
@@ -446,7 +473,8 @@ public class MockSessionFactory implemen
Property<String> p = createNiceMock(StringProperty.class);
expect(p.getType()).andReturn(PropertyType.HTML).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_HTML).anyTimes();
+
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_HTML)
+ .anyTimes();
expect(p.getValueAsString()).andReturn(
MockSessionFactory.PROPERTY_VALUE_HTML.toString()).anyTimes();
@@ -459,7 +487,8 @@ public class MockSessionFactory implemen
Property<String> p = createNiceMock(StringProperty.class);
expect(p.getType()).andReturn(PropertyType.ID).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_ID).anyTimes();
+
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_ID)
+ .anyTimes();
expect(p.getValueAsString()).andReturn(
MockSessionFactory.PROPERTY_VALUE_ID.toString()).anyTimes();
@@ -472,7 +501,8 @@ public class MockSessionFactory implemen
Property<URI> p = createNiceMock(UriProperty.class);
expect(p.getType()).andReturn(PropertyType.URI).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_URI).anyTimes();
+
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_URI)
+ .anyTimes();
expect(p.getValueAsString()).andReturn(
MockSessionFactory.PROPERTY_VALUE_URI.toString()).anyTimes();
@@ -485,8 +515,8 @@ public class MockSessionFactory implemen
Property<Double> p = createNiceMock(DoubleProperty.class);
expect(p.getType()).andReturn(PropertyType.DECIMAL).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_DOUBLE)
- .anyTimes();
+ expect(p.getValue())
+
.andReturn(MockSessionFactory.PROPERTY_VALUE_DOUBLE).anyTimes();
expect(p.getValueAsString()).andReturn(
MockSessionFactory.PROPERTY_VALUE_DOUBLE.toString()).anyTimes();
@@ -499,7 +529,8 @@ public class MockSessionFactory implemen
Property<Float> p = createNiceMock(FloatProperty.class);
expect(p.getType()).andReturn(PropertyType.DECIMAL).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_FLOAT).anyTimes();
+
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_FLOAT)
+ .anyTimes();
expect(p.getValueAsString()).andReturn(
MockSessionFactory.PROPERTY_VALUE_FLOAT.toString()).anyTimes();
@@ -512,10 +543,11 @@ public class MockSessionFactory implemen
Property<Boolean> p = createNiceMock(BooleanProperty.class);
expect(p.getType()).andReturn(PropertyType.BOOLEAN).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_BOOLEAN)
- .anyTimes();
+ expect(p.getValue()).andReturn(
+
MockSessionFactory.PROPERTY_VALUE_BOOLEAN).anyTimes();
expect(p.getValueAsString()).andReturn(
-
MockSessionFactory.PROPERTY_VALUE_BOOLEAN.toString()).anyTimes();
+
MockSessionFactory.PROPERTY_VALUE_BOOLEAN.toString())
+ .anyTimes();
replay(p);
@@ -526,10 +558,11 @@ public class MockSessionFactory implemen
Property<Integer> p = createNiceMock(IntegerProperty.class);
expect(p.getType()).andReturn(PropertyType.INTEGER).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_INTEGER)
- .anyTimes();
+ expect(p.getValue()).andReturn(
+
MockSessionFactory.PROPERTY_VALUE_INTEGER).anyTimes();
expect(p.getValueAsString()).andReturn(
-
MockSessionFactory.PROPERTY_VALUE_INTEGER.toString()).anyTimes();
+
MockSessionFactory.PROPERTY_VALUE_INTEGER.toString())
+ .anyTimes();
replay(p);
@@ -540,8 +573,8 @@ public class MockSessionFactory implemen
Property<String> p = createNiceMock(StringProperty.class);
expect(p.getType()).andReturn(PropertyType.STRING).anyTimes();
-
expect(p.getValue()).andReturn(MockSessionFactory.PROPERTY_VALUE_STRING)
- .anyTimes();
+ expect(p.getValue())
+
.andReturn(MockSessionFactory.PROPERTY_VALUE_STRING).anyTimes();
expect(p.getValueAsString()).andReturn(
MockSessionFactory.PROPERTY_VALUE_STRING.toString()).anyTimes();
@@ -664,35 +697,41 @@ public class MockSessionFactory implemen
expect(bft.getId()).andReturn(ObjectType.FOLDER_BASETYPE_ID).anyTimes();
expect(bft.isBaseType()).andReturn(true);
expect(bft.getBaseType()).andReturn(null).anyTimes();
-
+ expect(bft.getPropertyDefintions()).andReturn((new
HashMap<String, PropertyDefinition<?>>())).anyTimes();
+
FolderType ft = createNiceMock(FolderType.class);
expect(ft.getId()).andReturn(FixtureData.FOLDER_TYPE_ID.toString())
.anyTimes();
expect(ft.isBaseType()).andReturn(false);
expect(ft.getBaseType()).andReturn(bft).anyTimes();
+ expect(ft.getPropertyDefintions()).andReturn((new
HashMap<String, PropertyDefinition<?>>())).anyTimes();
PolicyType bpt = createNiceMock(PolicyType.class);
expect(bpt.getId()).andReturn(ObjectType.POLICY_BASETYPE_ID).anyTimes();
expect(bpt.isBaseType()).andReturn(true);
expect(bpt.getBaseType()).andReturn(null).anyTimes();
+ expect(bpt.getPropertyDefintions()).andReturn((new
HashMap<String, PropertyDefinition<?>>())).anyTimes();
RelationshipType brt = createNiceMock(RelationshipType.class);
expect(brt.getId()).andReturn(ObjectType.RELATIONSHIP_BASETYPE_ID)
.anyTimes();
expect(brt.isBaseType()).andReturn(true);
expect(brt.getBaseType()).andReturn(null).anyTimes();
+ expect(brt.getPropertyDefintions()).andReturn((new
HashMap<String, PropertyDefinition<?>>())).anyTimes();
DocumentType bdt = createNiceMock(DocumentType.class);
expect(bdt.getId()).andReturn(ObjectType.DOCUMENT_BASETYPE_ID)
.anyTimes();
expect(bdt.isBaseType()).andReturn(true);
expect(bdt.getBaseType()).andReturn(null).anyTimes();
+ expect(bdt.getPropertyDefintions()).andReturn((new
HashMap<String, PropertyDefinition<?>>())).anyTimes();
DocumentType dt = createNiceMock(DocumentType.class);
expect(dt.getId()).andReturn(FixtureData.DOCUMENT_TYPE_ID.toString())
.anyTimes();
expect(dt.isBaseType()).andReturn(false);
expect(dt.getBaseType()).andReturn(bft).anyTimes();
+ expect(dt.getPropertyDefintions()).andReturn((new
HashMap<String, PropertyDefinition<?>>())).anyTimes();
replay(bft);
replay(ft);
Modified:
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-provider-impl/src/test/java/org/apache/opencmis/client/provider/atompub/SimpleReadWriteTests.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-provider-impl/src/test/java/org/apache/opencmis/client/provider/atompub/SimpleReadWriteTests.java?rev=925130&r1=925129&r2=925130&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-provider-impl/src/test/java/org/apache/opencmis/client/provider/atompub/SimpleReadWriteTests.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-provider-impl/src/test/java/org/apache/opencmis/client/provider/atompub/SimpleReadWriteTests.java
Fri Mar 19 08:18:28 2010
@@ -18,7 +18,6 @@
*/
package org.apache.opencmis.client.provider.atompub;
-import java.net.CookiePolicy;
import java.util.HashSet;
import java.util.Set;
Modified:
incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-api/src/main/java/org/apache/opencmis/commons/SessionParameter.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-api/src/main/java/org/apache/opencmis/commons/SessionParameter.java?rev=925130&r1=925129&r2=925130&view=diff
==============================================================================
---
incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-api/src/main/java/org/apache/opencmis/commons/SessionParameter.java
(original)
+++
incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-api/src/main/java/org/apache/opencmis/commons/SessionParameter.java
Fri Mar 19 08:18:28 2010
@@ -24,10 +24,7 @@ package org.apache.opencmis.commons;
* @author <a href="mailto:[email protected]";>Florian Müller</a>
*
*/
-public final class SessionParameter {
-
- private SessionParameter() {
- }
+public interface SessionParameter {
// ---- general parameter ----
public static final String USER = "org.apache.opencmis.user";
